Xproto Xos.h,3.39,3.40

[Daniel Stone]

Committed by: daniels

Update of /cvs/xlibs/Xproto
In directory gabe:/tmp/cvs-serv11077

Modified Files:
	Xos.h 
Log Message:
Minor compile fixes; missed check-in for X.Org HEAD sync.

Index: Xos.h
===================================================================
RCS file: /cvs/xlibs/Xproto/Xos.h,v
retrieving revision 3.39
retrieving revision 3.40
diff -u -d -r3.39 -r3.40
--- Xos.h	25 Mar 2003 04:18:07 -0000	3.39
+++ Xos.h	28 Jan 2005 20:46:55 -0000	3.40
@@ -197,11 +197,12 @@
 #define _POSIX_SOURCE
 #elif defined(WIN32)
 #include <time.h>
-#if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_)
+#if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_) && !defined(_TIMEVAL_DEFINED) && !defined(_STRUCT_TIMEVAL)
 struct timeval {
     long    tv_sec;         /* seconds */
     long    tv_usec;        /* and microseconds */
 };
+#define _TIMEVAL_DEFINED
 #endif
 #include <sys/timeb.h>
 #define gettimeofday(t) \
@@ -262,7 +263,7 @@
 #endif
 
 #if defined(ISC) || defined(__UNIXOS2__) || \
-    (defined(linux) && !defined(__GLIBC__)) || \
+    (defined(__linux__) && !defined(__GLIBC__)) || \
     (defined(__QNX__) && !defined(UNIXCONN))
 /*
  *	Some OS's may not have this