Module Name: src
Committed By: mrg
Date: Fri Jul 17 17:57:11 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xfs: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.serverlib
Log Message:
don't hard code FD_SETSIZE now that the code is fine.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/bin/xfs/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xfs/Makefile
diff -u src/external/mit/xorg/bin/xfs/Makefile:1.11 src/external/mit/xorg/bin/xfs/Makefile:1.12
--- src/external/mit/xorg/bin/xfs/Makefile:1.11 Fri Jul 17 08:30:33 2015
+++ src/external/mit/xorg/bin/xfs/Makefile Fri Jul 17 17:57:11 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/07/17 08:30:33 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2015/07/17 17:57:11 mrg Exp $
.include <bsd.own.mk>
@@ -24,9 +24,6 @@ CPPFLAGS+= -I${XFSDIR}/include \
-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
Index: src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.6 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.7
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.6 Fri Jul 17 08:30:33 2015
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Fri Jul 17 17:57:11 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.6 2015/07/17 08:30:33 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.7 2015/07/17 17:57:11 mrg Exp $
NOLINT= 1
NOPROFILE= 1
@@ -17,9 +17,6 @@ X_BYTE_ORDER=0
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
