[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xorg-devel
Subject:    [PATCH:xserver] Move X11/Xpoll.h include earlier than sys/select.h
From:       Thomas Klausner <wiz () NetBSD ! org>
Date:       2015-07-28 16:50:30
Message-ID: 1438102230-13957-1-git-send-email-wiz () NetBSD ! org
[Download RAW message or body]

From: Matthew Green <mrg@NetBSD.org>

Assures setting FD_SETSIZE early enough.

Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
---
 os/WaitFor.c    | 3 ++-
 os/connection.c | 3 ++-
 os/io.c         | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/os/WaitFor.c b/os/WaitFor.c
index 431f1a6..ad9fd3d 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -56,6 +56,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <X11/Xpoll.h>
+
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
@@ -66,7 +68,6 @@ SOFTWARE.
 #include "misc.h"
 
 #include "osdep.h"
-#include <X11/Xpoll.h>
 #include "dixstruct.h"
 #include "opaque.h"
 #ifdef DPMSExtension
diff --git a/os/connection.c b/os/connection.c
index c36b125..acafc09 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -64,6 +64,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <X11/Xpoll.h>
+
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
@@ -103,7 +105,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"
diff --git a/os/io.c b/os/io.c
index 96a243d..ae973cf 100644
--- a/os/io.c
+++ b/os/io.c
@@ -57,6 +57,8 @@ SOFTWARE.
 
 #undef DEBUG_COMMUNICATION
 
+#include <X11/Xpoll.h>
+
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
@@ -74,7 +76,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"
-- 
2.4.6

_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[prev in list] [next in list] [prev in thread] [next in thread]