diff options
author | Stefan Metzmacher <metze@samba.org> | 2006-01-11 15:07:14 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:50:05 -0500 |
commit | b3f2db5e018b8e1c1f7ed2ba93608cc544bdca42 (patch) | |
tree | 46ee918009d82286917475974e70dd269c241041 | |
parent | 2e8937c334b20b07d28f1a6647f97c1df5da44e7 (diff) | |
download | samba-b3f2db5e018b8e1c1f7ed2ba93608cc544bdca42.tar.gz samba-b3f2db5e018b8e1c1f7ed2ba93608cc544bdca42.tar.bz2 samba-b3f2db5e018b8e1c1f7ed2ba93608cc544bdca42.zip |
r12844: don't include system headers directly
metze
(This used to be commit 75a98047d6829cadf4b9082bec2733055dad3465)
-rw-r--r-- | source4/include/system/select.h | 8 | ||||
-rw-r--r-- | source4/lib/events/events_standard.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source4/include/system/select.h b/source4/include/system/select.h index 2b800fd270..c0595492cd 100644 --- a/source4/include/system/select.h +++ b/source4/include/system/select.h @@ -28,3 +28,11 @@ #define SELECT_CAST #endif +/* use epoll if it is available */ +#if defined(HAVE_EPOLL_CREATE) && defined(HAVE_SYS_EPOLL_H) +#define WITH_EPOLL 1 +#endif + +#if WITH_EPOLL +#include <sys/epoll.h> +#endif diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c index df2368af3e..974007b999 100644 --- a/source4/lib/events/events_standard.c +++ b/source4/lib/events/events_standard.c @@ -34,15 +34,6 @@ #include "lib/events/events.h" #include "lib/events/events_internal.h" -/* use epoll if it is available */ -#if defined(HAVE_EPOLL_CREATE) && defined(HAVE_SYS_EPOLL_H) -#define WITH_EPOLL 1 -#endif - -#if WITH_EPOLL -#include <sys/epoll.h> -#endif - struct std_event_context { /* a pointer back to the generic event_context */ struct event_context *ev; @@ -73,6 +64,7 @@ struct std_event_context { static void std_event_loop_timer(struct std_event_context *std_ev); +/* use epoll if it is available */ #if WITH_EPOLL /* called when a epoll call fails, and we should fallback |