[src/trunk]: src/external/mit/xorg define FD_SETSIZE=512, to match the new XF...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0ce247579964
branches:  trunk
changeset: 339367:0ce247579964
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jul 17 08:30:33 2015 +0000

description:
define FD_SETSIZE=512, to match the new XFD_SETSIZE.  something ends up
including <sys/select.h> before Xpoll.h, and the wrong FD_SETSIZE is
used in our fd_set macros, leading to fail.

XXX:  ugh.  fix me properly.

diffstat:

 external/mit/xorg/bin/xfs/Makefile                      |  5 ++++-
 external/mit/xorg/server/xorg-server/Makefile.serverlib |  5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r d7a06f664738 -r 0ce247579964 external/mit/xorg/bin/xfs/Makefile
--- a/external/mit/xorg/bin/xfs/Makefile        Fri Jul 17 08:29:31 2015 +0000
+++ b/external/mit/xorg/bin/xfs/Makefile        Fri Jul 17 08:30:33 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2014/08/24 18:27:16 apb Exp $
+#      $NetBSD: Makefile,v 1.11 2015/07/17 08:30:33 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -24,6 +24,9 @@
                        -I${XFSDIR}/../include \
                        -DHAVE_DAEMON
 
+# XXX
+CPPFLAGS+=             -DFD_SETSIZE=512
+
 CONN_DEFINES=          ${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \
                        -DTRANS_REOPEN -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT
 
diff -r d7a06f664738 -r 0ce247579964 external/mit/xorg/server/xorg-server/Makefile.serverlib
--- a/external/mit/xorg/server/xorg-server/Makefile.serverlib   Fri Jul 17 08:29:31 2015 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.serverlib   Fri Jul 17 08:30:33 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.serverlib,v 1.5 2014/12/08 06:33:26 mrg Exp $
+#      $NetBSD: Makefile.serverlib,v 1.6 2015/07/17 08:30:33 mrg Exp $
 
 NOLINT=         1
 NOPROFILE=      1
@@ -17,6 +17,9 @@
 CPPFLAGS+=     ${X11FLAGS.SERVER}
 CPPFLAGS+=     -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
+# XXX
+CPPFLAGS+=     -DFD_SETSIZE=512
+
 .if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
 CPPFLAGS+=     -D__GLX_ALIGN64
 .endif