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.diff -r1.3 -r1.4 xsrc/external/mit/xproto/dist/Xpoll.h.in
(mrg)
--- xsrc/external/mit/xproto/dist/Attic/Xpoll.h.in 2015/07/17 07:02:40 1.3
+++ xsrc/external/mit/xproto/dist/Attic/Xpoll.h.in 2017/03/04 22:07:14 1.4
@@ -54,10 +54,13 @@
#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 @@
#else /* WIN32 */
-#define XFD_SETSIZE 256
+#define XFD_SETSIZE 512
#ifndef FD_SETSIZE
#define FD_SETSIZE XFD_SETSIZE
#endif