summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Green <mrg@NetBSD.org>2015-07-19 09:54:59 +0200
committerThomas Klausner <wiz@NetBSD.org>2015-07-19 23:01:41 +0200
commit1508df2fa02daff7a5cd58ce5d64e42b44ff4065 (patch)
treee1c26eef19924e17785407db59b9f99e9f466dfd
parent4fdc960c33724f859be74a630e0d668a74f6637d (diff)
FD_SETSIZE fixes.
Move X11/Xpoll.h include earlier than sys/select.h to avoid missing out on setting FD_SETSIZE early enough. Signed-off-by: Thomas Klausner <wiz@NetBSD.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--os/connection.c2
-rw-r--r--os/io.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/os/connection.c b/os/connection.c
index caaa6c4..b5fa210 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -69,6 +69,7 @@ in this Software without prior written authorization from The Open Group.
#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 authorization from The Open Group.
#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"
diff --git a/os/io.c b/os/io.c
index 124ecd8..8ebb8e4 100644
--- a/os/io.c
+++ b/os/io.c
@@ -46,6 +46,8 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
+#include "X11/Xpoll.h"
+
#include "config.h"
#include <X11/Xtrans/Xtrans.h>
@@ -57,7 +59,6 @@ in this Software without prior written authorization from The Open Group.
#include <X11/fonts/FSproto.h>
#include "clientstr.h"
-#include "X11/Xpoll.h"
#include "osdep.h"
#include "globals.h"
#include "dispatch.h"