Rev 316: merge from samba4 in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 316
revision-id: tridge at samba.org-20070517223310-2lgsuw029kzeanwi
parent: tridge at samba.org-20070517132341-3syo9kztm9ckwpbs
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Fri 2007-05-18 08:33:10 +1000
message:
  merge from samba4
modified:
  lib/events/events_aio.c        events_aio.c-20070501213746-4fxluwiq4rcxib8p-1
  lib/events/events_epoll.c      events_epoll.c-20070501213746-4fxluwiq4rcxib8p-2
  lib/events/events_standard.c   events_standard.c-20061117234101-o3qt14umlg9en8z0-30
=== modified file 'lib/events/events_aio.c'
--- a/lib/events/events_aio.c	2007-05-17 07:54:02 +0000
+++ b/lib/events/events_aio.c	2007-05-17 22:33:10 +0000
@@ -33,6 +33,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "system/network.h"
 #include "lib/util/dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/events/events_internal.h"

=== modified file 'lib/events/events_epoll.c'
--- a/lib/events/events_epoll.c	2007-05-17 07:54:02 +0000
+++ b/lib/events/events_epoll.c	2007-05-17 22:33:10 +0000
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "system/network.h"
 #include "lib/util/dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/events/events_internal.h"

=== modified file 'lib/events/events_standard.c'
--- a/lib/events/events_standard.c	2007-05-17 07:54:02 +0000
+++ b/lib/events/events_standard.c	2007-05-17 22:33:10 +0000
@@ -30,6 +30,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "system/network.h"
 #include "system/select.h" /* needed for HAVE_EVENTS_EPOLL */
 #include "lib/util/dlinklist.h"
 #include "lib/events/events.h"
@@ -329,6 +330,7 @@
 #define epoll_del_event(std_ev,fde)
 #define epoll_change_event(std_ev,fde)
 #define epoll_event_loop(std_ev,tvalp) (-1)
+#define epoll_check_reopen(std_ev)
 #endif
 
 /*