Module Name: xsrc
Committed By: mrg
Date: Sat Mar 4 22:07:14 UTC 2017
Modified Files:
xsrc/external/mit/xproto/dist: Xpoll.h.in
Log Message:
merge our local change to ensure FD_SETSIZE is set before <sys/select.h>
is included, using the new version of the code to set XFD_SETSIZE.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xproto/dist/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/xproto/dist/Xpoll.h.in
diff -u xsrc/external/mit/xproto/dist/Xpoll.h.in:1.3 xsrc/external/mit/xproto/dist/Xpoll.h.in:1.4
--- xsrc/external/mit/xproto/dist/Xpoll.h.in:1.3 Fri Jul 17 07:02:40 2015
+++ xsrc/external/mit/xproto/dist/Xpoll.h.in Sat Mar 4 22:07:14 2017
@@ -54,10 +54,13 @@ from The Open Group.
#ifndef USE_POLL
-#define XFD_SETSIZE 512
-
-#ifndef FD_SETSIZE
-#define FD_SETSIZE XFD_SETSIZE
+#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>
@@ -165,7 +168,7 @@ typedef struct fd_set {
#else /* WIN32 */
-#define XFD_SETSIZE 256
+#define XFD_SETSIZE 512
#ifndef FD_SETSIZE
#define FD_SETSIZE XFD_SETSIZE
#endif
