svn commit: samba r12844 - in branches/SAMBA_4_0/source: include/system lib/events

metze at samba.org metze at samba.org
Wed Jan 11 15:07:14 GMT 2006


Author: metze
Date: 2006-01-11 15:07:14 +0000 (Wed, 11 Jan 2006)
New Revision: 12844

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12844

Log:
don't include system headers directly

metze
Modified:
   branches/SAMBA_4_0/source/include/system/select.h
   branches/SAMBA_4_0/source/lib/events/events_standard.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/system/select.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/select.h	2006-01-11 15:03:20 UTC (rev 12843)
+++ branches/SAMBA_4_0/source/include/system/select.h	2006-01-11 15:07:14 UTC (rev 12844)
@@ -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

Modified: branches/SAMBA_4_0/source/lib/events/events_standard.c
===================================================================
--- branches/SAMBA_4_0/source/lib/events/events_standard.c	2006-01-11 15:03:20 UTC (rev 12843)
+++ branches/SAMBA_4_0/source/lib/events/events_standard.c	2006-01-11 15:07:14 UTC (rev 12844)
@@ -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 @@
 
 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



More information about the samba-cvs mailing list