summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2009-10-11 14:48:08 +0000
committerStefan Bühler <stbuehler@web.de>2009-10-11 14:48:08 +0000
commit122831dc17739c8d45ca1906eef84c7d2aa20404 (patch)
treefea701d4a284f021769abab68fd4214ae307d728
parent22e8b456a9800efb92bd0f90a2e1b816d3b4bb07 (diff)
downloadlighttpd-git-122831dc17739c8d45ca1906eef84c7d2aa20404.tar.gz
Fix some compile problems from header inclusion reorder patch
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2625 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--src/fdevent.h9
-rw-r--r--src/fdevent_linux_rtsig.c1
2 files changed, 7 insertions, 3 deletions
diff --git a/src/fdevent.h b/src/fdevent.h
index d6ee3f2f..7eaee471 100644
--- a/src/fdevent.h
+++ b/src/fdevent.h
@@ -8,12 +8,15 @@
#include "settings.h"
#include "bitset.h"
+#if defined HAVE_STDINT_H
+# include <stdint.h>
+#elif defined HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+
/* select event-system */
#if defined(HAVE_EPOLL_CTL) && defined(HAVE_SYS_EPOLL_H)
-# if defined HAVE_STDINT_H
-# include <stdint.h>
-# endif
# define USE_LINUX_EPOLL
# include <sys/epoll.h>
#endif
diff --git a/src/fdevent_linux_rtsig.c b/src/fdevent_linux_rtsig.c
index 624c9809..e04d9cf8 100644
--- a/src/fdevent_linux_rtsig.c
+++ b/src/fdevent_linux_rtsig.c
@@ -11,6 +11,7 @@
#include <signal.h>
#include <limits.h>
+#define __USE_GNU /* a hack in my eyes, should work with _GNU_SOURCE */
#include <fcntl.h>
#ifdef USE_LINUX_SIGIO