From: Dana Jansens <danakj@orodu.net>
Date: Mon, 21 Dec 2009 21:17:48 +0000 (-0500)
Subject: check more headers before including them
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=ce24cbd045b2a93a04c5cd258137ab8572f2c429

check more headers before including them
---

diff --git a/configure.ac b/configure.ac
index 379440a2..aa575657 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,8 @@ AM_GNU_GETTEXT_VERSION(0.15)
 AM_GNU_GETTEXT([external])
 
 AC_CHECK_HEADERS(ctype.h fcntl.h locale.h signal.h string.h stdio.h stdlib.h)
-AC_CHECK_HEADERS(unistd.h sys/stat.h sys/select.h sys/time.h sys/wait.h)
+AC_CHECK_HEADERS(unistd.h sys/stat.h sys/select.h sys/socket.h sys/time.h)
+AC_CHECK_HEADERS(sys/wait.h)
 # AC_HEADER_TIME
 # AC_TYPE_SIGNAL
 
diff --git a/obt/mainloop.c b/obt/mainloop.c
index 691c6875..bf866aec 100644
--- a/obt/mainloop.c
+++ b/obt/mainloop.c
@@ -21,10 +21,21 @@
 #include "obt/display.h"
 #include "obt/util.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
+#endif
 
 typedef struct _ObtMainLoopTimer             ObtMainLoopTimer;
 typedef struct _ObtMainLoopSignal            ObtMainLoopSignal;