Module Name: xsrc
Committed By: mrg
Date: Wed Mar 14 07:57:44 UTC 2018
Modified Files:
xsrc/external/mit/xorgproto/dist/include/X11: Xpoll.h.in
Log Message:
merge our local fixes for Xpoll.h.in -- moves FD_SETSIZE.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorgproto/dist/include/X11/Xpoll.h.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorgproto/dist/include/X11/Xpoll.h.in
diff -u xsrc/external/mit/xorgproto/dist/include/X11/Xpoll.h.in:1.1.1.1 xsrc/external/mit/xorgproto/dist/include/X11/Xpoll.h.in:1.2
--- xsrc/external/mit/xorgproto/dist/include/X11/Xpoll.h.in:1.1.1.1 Wed Mar 14 07:25:45 2018
+++ xsrc/external/mit/xorgproto/dist/include/X11/Xpoll.h.in Wed Mar 14 07:57:43 2018
@@ -54,6 +54,15 @@ from The Open Group.
#ifndef USE_POLL
+#if defined(FD_SETSIZE) && FD_SETSIZE < 512
+# define XFD_SETSIZE FD_SETSIZE
+#else
+# define XFD_SETSIZE 512
+# ifndef FD_SETSIZE
+# define FD_SETSIZE XFD_SETSIZE
+# endif
+#endif
+
#include <X11/Xos.h>
#include <sys/select.h> /* Get the FD_* macros. */
@@ -67,15 +76,6 @@ typedef long fd_mask;
# endif
#endif
-#if defined(FD_SETSIZE) && FD_SETSIZE < 512
-# define XFD_SETSIZE FD_SETSIZE
-#else
-# define XFD_SETSIZE 512
-# ifndef FD_SETSIZE
-# define FD_SETSIZE XFD_SETSIZE
-# endif
-#endif
-
#ifndef NBBY
#define NBBY 8 /* number of bits in a byte */
#endif
