diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-05-18 08:33:10 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-05-18 08:33:10 +1000 |
| commit | 51f5bd2b316e51528567d2281817fc37eeca1674 (patch) | |
| tree | 2cf19150aa8b0e8e5ea3a05737eb457598ded71a /ctdb/lib | |
| parent | 49fe66713fbf01b83cdee09e26d5e3641039d81a (diff) | |
| download | samba-51f5bd2b316e51528567d2281817fc37eeca1674.tar.gz samba-51f5bd2b316e51528567d2281817fc37eeca1674.tar.xz samba-51f5bd2b316e51528567d2281817fc37eeca1674.zip | |
merge from samba4
(This used to be ctdb commit b280bb01fc9afea5a9168c63d92907dac725b22b)
Diffstat (limited to 'ctdb/lib')
| -rw-r--r-- | ctdb/lib/events/events_aio.c | 1 | ||||
| -rw-r--r-- | ctdb/lib/events/events_epoll.c | 1 | ||||
| -rw-r--r-- | ctdb/lib/events/events_standard.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/ctdb/lib/events/events_aio.c b/ctdb/lib/events/events_aio.c index ae5f597c18..afc806a276 100644 --- a/ctdb/lib/events/events_aio.c +++ b/ctdb/lib/events/events_aio.c @@ -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" diff --git a/ctdb/lib/events/events_epoll.c b/ctdb/lib/events/events_epoll.c index 413925357e..9874377141 100644 --- a/ctdb/lib/events/events_epoll.c +++ b/ctdb/lib/events/events_epoll.c @@ -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" diff --git a/ctdb/lib/events/events_standard.c b/ctdb/lib/events/events_standard.c index ee3ca4e535..8150a069c0 100644 --- a/ctdb/lib/events/events_standard.c +++ b/ctdb/lib/events/events_standard.c @@ -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 @@ static int epoll_event_loop(struct std_event_context *std_ev, struct timeval *tv #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 /* |