Module Name: xsrc
Committed By: mrg
Date: Fri Jul 17 17:38:55 UTC 2015
Modified Files:
xsrc/external/mit/xfs/dist/os: connection.c
xsrc/external/mit/xorg-server/dist/os: WaitFor.c connection.c io.c
Log Message:
move X11/Xpoll.h include earlier than sys/select.h to avoid missing
out on setting FD_SETSIZE early enough.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xfs/dist/os/connection.c
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-server/dist/os/WaitFor.c \
xsrc/external/mit/xorg-server/dist/os/connection.c \
xsrc/external/mit/xorg-server/dist/os/io.c
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/xfs/dist/os/connection.c
diff -u xsrc/external/mit/xfs/dist/os/connection.c:1.1.1.5 xsrc/external/mit/xfs/dist/os/connection.c:1.2
--- xsrc/external/mit/xfs/dist/os/connection.c:1.1.1.5 Wed Feb 25 20:02:39 2015
+++ xsrc/external/mit/xfs/dist/os/connection.c Fri Jul 17 17:38:55 2015
@@ -69,6 +69,7 @@ in this Software without prior written a
#include "config.h"
+#include "X11/Xpoll.h"
#include <stdlib.h>
#include <X11/Xtrans/Xtrans.h>
#include <stdlib.h>
@@ -84,7 +85,6 @@ in this Software without prior written a
#include <X11/fonts/FS.h>
#include <X11/fonts/FSproto.h>
#include "clientstr.h"
-#include "X11/Xpoll.h"
#include "osdep.h"
#include "globals.h"
#include "osstruct.h"
Index: xsrc/external/mit/xorg-server/dist/os/WaitFor.c
diff -u xsrc/external/mit/xorg-server/dist/os/WaitFor.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/os/WaitFor.c:1.2
--- xsrc/external/mit/xorg-server/dist/os/WaitFor.c:1.1.1.4 Tue Aug 2 06:57:04 2011
+++ xsrc/external/mit/xorg-server/dist/os/WaitFor.c Fri Jul 17 17:38:55 2015
@@ -54,6 +54,8 @@ SOFTWARE.
*
*****************************************************************/
+#include <X11/Xpoll.h>
+
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
@@ -68,7 +70,6 @@ SOFTWARE.
#include "misc.h"
#include "osdep.h"
-#include <X11/Xpoll.h>
#include "dixstruct.h"
#include "opaque.h"
#ifdef DPMSExtension
Index: xsrc/external/mit/xorg-server/dist/os/connection.c
diff -u xsrc/external/mit/xorg-server/dist/os/connection.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/os/connection.c:1.2
--- xsrc/external/mit/xorg-server/dist/os/connection.c:1.1.1.4 Tue Aug 2 06:57:04 2011
+++ xsrc/external/mit/xorg-server/dist/os/connection.c Fri Jul 17 17:38:55 2015
@@ -61,6 +61,8 @@ SOFTWARE.
*
*****************************************************************/
+#include <X11/Xpoll.h>
+
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
@@ -106,7 +108,6 @@ SOFTWARE.
#endif /* WIN32 */
#include "misc.h" /* for typedef of pointer */
#include "osdep.h"
-#include <X11/Xpoll.h>
#include "opaque.h"
#include "dixstruct.h"
#include "xace.h"
Index: xsrc/external/mit/xorg-server/dist/os/io.c
diff -u xsrc/external/mit/xorg-server/dist/os/io.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/os/io.c:1.2
--- xsrc/external/mit/xorg-server/dist/os/io.c:1.1.1.4 Sun Jul 24 01:29:16 2011
+++ xsrc/external/mit/xorg-server/dist/os/io.c Fri Jul 17 17:38:55 2015
@@ -53,6 +53,8 @@ SOFTWARE.
*
*****************************************************************/
+#include <X11/Xpoll.h>
+
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
@@ -76,7 +78,6 @@ SOFTWARE.
#include <X11/Xproto.h>
#include "os.h"
#include "osdep.h"
-#include <X11/Xpoll.h>
#include "opaque.h"
#include "dixstruct.h"
#include "misc.h"
