diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-15 08:08:43 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-15 08:08:43 +1000 |
| commit | d55e57ca99de4c094113c18bf18179923f641887 (patch) | |
| tree | d16297afd1b1c1a58082acbdf3cc41c8da6916ec /source4/lib/events/events_standard.c | |
| parent | ff7c537e278194453311ce9a310a8e24cb410d32 (diff) | |
| parent | 8113bb07a8eaee2bce1290bff1f06856bc7c76e6 (diff) | |
| download | samba-d55e57ca99de4c094113c18bf18179923f641887.tar.gz samba-d55e57ca99de4c094113c18bf18179923f641887.tar.bz2 samba-d55e57ca99de4c094113c18bf18179923f641887.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 618400fe7d1f469150b82e0aebc89b2104de116f)
Diffstat (limited to 'source4/lib/events/events_standard.c')
| -rw-r--r-- | source4/lib/events/events_standard.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c index 7b945b154d..4e41c42206 100644 --- a/source4/lib/events/events_standard.c +++ b/source4/lib/events/events_standard.c @@ -27,13 +27,18 @@ at runtime we fallback to select() */ +#if _SAMBA_BUILD_ #include "includes.h" +#include "lib/util/dlinklist.h" +#else +#include "replace.h" +#include "events_util.h" +#endif #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" -#include "lib/events/events_internal.h" +#include "events.h" +#include "events_internal.h" struct std_event_context { /* a pointer back to the generic event_context */ |