Xproto ChangeLog, 3.10, 3.11 Xmd.h, 3.18, 3.19 Xos_r.h, 1.19, 1.20 Xpoll.h, 3.9, 3.10 Xthreads.h, 3.11, 3.12 keysymdef.h, 1.12, 1.13

Fri Jan 28 12:12:05 PST 2005

Committed by: daniels

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

Modified Files:
	ChangeLog Xmd.h Xos_r.h Xpoll.h Xthreads.h keysymdef.h 
Log Message:
Resync from X.Org HEAD.

Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/Xproto/ChangeLog,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11

--- ChangeLog	1 Jul 2004 10:10:22 -0000	3.10
+++ ChangeLog	28 Jan 2005 20:12:03 -0000	3.11
@@ -1,3 +1,13 @@
+2005-01-29  Daniel Stone  <daniel@freedesktop.org>
+	
+	* Xmd.h:
+	* Xos.h:
+	* Xos_r.h:
+	* Xpoll.h:
+	* Xthreads.h:
+	* keysymdef.h:
+	Resync from X.Org HEAD.
+
 2004-07-01  Daniel Stone  <daniel@freedesktop.org>
 	
 	* Makefile.am:

Index: Xmd.h
===================================================================
RCS file: /cvs/xlibs/Xproto/Xmd.h,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -d -r3.18 -r3.19
--- Xmd.h	7 Jul 2003 15:34:21 -0000	3.18
+++ Xmd.h	28 Jan 2005 20:12:03 -0000	3.19
@@ -64,14 +64,11 @@
     defined(__sparc64__) || \
     defined(__s390x__) || \
     (defined(__hppa__) && defined(__LP64__)) || \
-    defined(__AMD64__) || defined(AMD64)
+    defined(__amd64__) || defined(amd64) || \
+    defined(__powerpc64__) || \
+    (defined(sgi) && (_MIPS_SZLONG == 64))
 #define LONG64				/* 32/64-bit architecture */
 #endif
-#ifdef __sgi
-#if (_MIPS_SZLONG == 64)
-#define LONG64
-#endif
-#endif
 
 /*
  * Stuff to handle large architecture machines; the constants were generated

Index: Xos_r.h
===================================================================
RCS file: /cvs/xlibs/Xproto/Xos_r.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Xos_r.h	2 Feb 2004 02:56:01 -0000	1.19
+++ Xos_r.h	28 Jan 2005 20:12:03 -0000	1.20
@@ -824,7 +824,7 @@
 /* Use regular, unsafe API. */
 typedef int _Xstrtokparams;	/* dummy */
 # define _XStrtok(s1,s2,p) \
- ( (void)(p), strtok((s1),(s2)) )
+ ( p = 0, (void)(p), strtok((s1),(s2)) )
 
 #elif !defined(XOS_USE_MTSAFE_STRINGAPI) || defined(XNO_MTSAFE_STRINGAPI)
 /* Systems with thread support but no _r API. */

Index: Xpoll.h
===================================================================
RCS file: /cvs/xlibs/Xproto/Xpoll.h,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- Xpoll.h	14 Dec 2001 19:53:26 -0000	3.9
+++ Xpoll.h	28 Jan 2005 20:12:03 -0000	3.10
@@ -118,62 +118,40 @@
 #endif
 
 /*
- * The following macros are used by the servers only. There is an
- * explicit assumption that the bit array in the fd_set is at least
- * 256 bits long (8 32-bit words). This is true on most modern POSIX 
- * systems. Note that this is merely an optimization for the servers
- * based on assumptions about the way that file descripters are
- * allocated on POSIX systems. 
- *
- * When porting X to new systems it is important to adjust these
- * macros if the system has fewer than 256 bits in the fd_set bit
- * array.
+ * The howmany(FD_SETSIZE, NFDBITS) computes the number of elements in the
+ * array. before accessing an element in the array we check it exists.
+ * If it does not exist then the compiler discards the code to access it. 
  */
 #define XFD_ANYSET(p) \
-		((p)->fds_bits[0] || (p)->fds_bits[1] || \
-		(p)->fds_bits[2] || (p)->fds_bits[3] || \
-		(p)->fds_bits[4] || (p)->fds_bits[5] || \
-		(p)->fds_bits[6] || (p)->fds_bits[7])
-
-#define XFD_COPYSET(src,dst) \
-		(dst)->fds_bits[0] = (src)->fds_bits[0]; \
-		(dst)->fds_bits[1] = (src)->fds_bits[1]; \
-		(dst)->fds_bits[2] = (src)->fds_bits[2]; \
-		(dst)->fds_bits[3] = (src)->fds_bits[3]; \
-		(dst)->fds_bits[4] = (src)->fds_bits[4]; \
-		(dst)->fds_bits[5] = (src)->fds_bits[5]; \
-		(dst)->fds_bits[6] = (src)->fds_bits[6]; \
-		(dst)->fds_bits[7] = (src)->fds_bits[7];
-
-#define XFD_ANDSET(dst,b1,b2) \
-		(dst)->fds_bits[0] = ((b1)->fds_bits[0] & (b2)->fds_bits[0]); \
-		(dst)->fds_bits[1] = ((b1)->fds_bits[1] & (b2)->fds_bits[1]); \
-		(dst)->fds_bits[2] = ((b1)->fds_bits[2] & (b2)->fds_bits[2]); \
-		(dst)->fds_bits[3] = ((b1)->fds_bits[3] & (b2)->fds_bits[3]); \
-		(dst)->fds_bits[4] = ((b1)->fds_bits[4] & (b2)->fds_bits[4]); \
-		(dst)->fds_bits[5] = ((b1)->fds_bits[5] & (b2)->fds_bits[5]); \
-		(dst)->fds_bits[6] = ((b1)->fds_bits[6] & (b2)->fds_bits[6]); \
-		(dst)->fds_bits[7] = ((b1)->fds_bits[7] & (b2)->fds_bits[7]);
-
-#define XFD_ORSET(dst,b1,b2) \
-		(dst)->fds_bits[0] = ((b1)->fds_bits[0] | (b2)->fds_bits[0]); \
-		(dst)->fds_bits[1] = ((b1)->fds_bits[1] | (b2)->fds_bits[1]); \
-		(dst)->fds_bits[2] = ((b1)->fds_bits[2] | (b2)->fds_bits[2]); \
-		(dst)->fds_bits[3] = ((b1)->fds_bits[3] | (b2)->fds_bits[3]); \
-		(dst)->fds_bits[4] = ((b1)->fds_bits[4] | (b2)->fds_bits[4]); \
-		(dst)->fds_bits[5] = ((b1)->fds_bits[5] | (b2)->fds_bits[5]); \
-		(dst)->fds_bits[6] = ((b1)->fds_bits[6] | (b2)->fds_bits[6]); \
-		(dst)->fds_bits[7] = ((b1)->fds_bits[7] | (b2)->fds_bits[7]);
+        ((howmany(FD_SETSIZE, NFDBITS) > 0 && (p)->fds_bits[0]) || \
+        (howmany(FD_SETSIZE, NFDBITS) > 1 && (p)->fds_bits[1]) || \
+        (howmany(FD_SETSIZE, NFDBITS) > 2 && (p)->fds_bits[2]) || \
+        (howmany(FD_SETSIZE, NFDBITS) > 3 && (p)->fds_bits[3]) || \
+        (howmany(FD_SETSIZE, NFDBITS) > 4 && (p)->fds_bits[4]) || \
+        (howmany(FD_SETSIZE, NFDBITS) > 5 && (p)->fds_bits[5]) || \
+        (howmany(FD_SETSIZE, NFDBITS) > 6 && (p)->fds_bits[6]) || \
+        (howmany(FD_SETSIZE, NFDBITS) > 7 && (p)->fds_bits[7]))
 
-#define XFD_UNSET(dst,b1) \
-		(dst)->fds_bits[0] &= ~((b1)->fds_bits[0]); \
-		(dst)->fds_bits[1] &= ~((b1)->fds_bits[1]); \
-		(dst)->fds_bits[2] &= ~((b1)->fds_bits[2]); \
-		(dst)->fds_bits[3] &= ~((b1)->fds_bits[3]); \
-		(dst)->fds_bits[4] &= ~((b1)->fds_bits[4]); \
-		(dst)->fds_bits[5] &= ~((b1)->fds_bits[5]); \
-		(dst)->fds_bits[6] &= ~((b1)->fds_bits[6]); \
-		(dst)->fds_bits[7] &= ~((b1)->fds_bits[7]);
+#define XFD_COPYSET(src,dst) { \
+        int __i__; \
+		for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
+            (dst)->fds_bits[__i__] = (src)->fds_bits[__i__]; \
+        }
+#define XFD_ANDSET(dst,b1,b2) { \
+        int __i__; \
+        for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
+            (dst)->fds_bits[__i__] = ((b1)->fds_bits[__i__] & (b2)->fds_bits[__i__]); \
+        }
+#define XFD_ORSET(dst,b1,b2) { \
+        int __i__; \
+        for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
+		    (dst)->fds_bits[__i__] = ((b1)->fds_bits[__i__] | (b2)->fds_bits[__i__]); \
+        }        
+#define XFD_UNSET(dst,b1) { \
+        int __i__; \
+        for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
+    		(dst)->fds_bits[__i__] &= ~((b1)->fds_bits[__i__]); \
+        }
 
 #else /* USE_POLL */
 #include <sys/poll.h>
@@ -213,7 +191,7 @@
 
 #define XFD_ORSET(dst,b1,b2) { \
     u_int __i; \
-    XFD_COPYSET(b1,dst); \
+    if (dst != b1) XFD_COPYSET(b1,dst); \
     for (__i = 0; __i < XFD_SETCOUNT(b2) ; __i++) { \
         if (!FD_ISSET(XFD_FD(b2,__i), dst)) \
 	   FD_SET(XFD_FD(b2,__i), dst); \

Index: Xthreads.h
===================================================================
RCS file: /cvs/xlibs/Xproto/Xthreads.h,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -d -r3.11 -r3.12
--- Xthreads.h	8 Mar 2003 19:14:53 -0000	3.11
+++ Xthreads.h	28 Jan 2005 20:12:03 -0000	3.12
@@ -94,6 +94,7 @@
 #else /* !SVR4 */
 #ifdef WIN32
 #define BOOL wBOOL
+#define INT32 wINT32
 #ifdef Status
 #undef Status
 #define Status wStatus
@@ -103,6 +104,7 @@
 #undef Status
 #define Status int
 #endif
+#undef INT32
 #undef BOOL
 typedef DWORD xthread_t;
 typedef DWORD xthread_key_t;
@@ -267,7 +269,7 @@
 #define xthread_clear_id(id) id = _X_no_thread_id
 #define xthread_equal(id1,id2) pthread_equal(id1, id2)
 #endif /* _DECTHREADS_ */
-#if defined(linux)
+#if defined(__linux__)
 #define xthread_have_id(id) !pthread_equal(id, 0)
 #define xthread_clear_id(id) id = 0
 #define xthread_equal(id1,id2) pthread_equal(id1, id2)

Index: keysymdef.h
===================================================================
RCS file: /cvs/xlibs/Xproto/keysymdef.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- keysymdef.h	14 Dec 2001 19:53:26 -0000	1.12
+++ keysymdef.h	28 Jan 2005 20:12:03 -0000	1.13
@@ -1,4 +1,4 @@
-/* $Xorg: keysymdef.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
+/* $Xorg: keysymdef.h,v 1.4 2001/02/09 02:03:23 $ */
 
 /***********************************************************
 Copyright 1987, 1994, 1998  The Open Group
@@ -47,767 +47,817 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/keysymdef.h,v 1.11 2001/01/17 17:53:12 dawes Exp $ */
+/* $XFree86: $ */
[...3717 lines suppressed...]
-#define XK_RupeeSign					0x20a8
-#define XK_WonSign					0x20a9
-#define XK_NewSheqelSign				0x20aa
-#define XK_DongSign					0x20ab
-#define XK_EuroSign					0x20ac
-#endif
+#define XK_EcuSign                    0x10020a0  /* U+20A0 EURO-CURRENCY SIGN */
+#define XK_ColonSign                  0x10020a1  /* U+20A1 COLON SIGN */
+#define XK_CruzeiroSign               0x10020a2  /* U+20A2 CRUZEIRO SIGN */
+#define XK_FFrancSign                 0x10020a3  /* U+20A3 FRENCH FRANC SIGN */
+#define XK_LiraSign                   0x10020a4  /* U+20A4 LIRA SIGN */
+#define XK_MillSign                   0x10020a5  /* U+20A5 MILL SIGN */
+#define XK_NairaSign                  0x10020a6  /* U+20A6 NAIRA SIGN */
+#define XK_PesetaSign                 0x10020a7  /* U+20A7 PESETA SIGN */
+#define XK_RupeeSign                  0x10020a8  /* U+20A8 RUPEE SIGN */
+#define XK_WonSign                    0x10020a9  /* U+20A9 WON SIGN */
+#define XK_NewSheqelSign              0x10020aa  /* U+20AA NEW SHEQEL SIGN */
+#define XK_DongSign                   0x10020ab  /* U+20AB DONG SIGN */
+#define XK_EuroSign                      0x20ac  /* U+20AC EURO SIGN */
+#endif /* XK_CURRENCY */

