diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 17:35:16 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 17:35:16 +0200 |
| commit | 4911af47f8cd750f9b0f1374b447f171318de964 (patch) | |
| tree | a28fdd6e18a560b10fa52e40cec9b9f2709b46fe /source4/lib/events/events_timed.c | |
| parent | d648c5849fba34b5691dcf1867ecd8f80fe35a6d (diff) | |
| parent | 250478d0445cf56e8b0b4e876977a9ae968ff55b (diff) | |
| download | samba-4911af47f8cd750f9b0f1374b447f171318de964.tar.gz samba-4911af47f8cd750f9b0f1374b447f171318de964.tar.bz2 samba-4911af47f8cd750f9b0f1374b447f171318de964.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 16dbbf75c7fa0f877659654a20bcab73b707e627)
Diffstat (limited to 'source4/lib/events/events_timed.c')
| -rw-r--r-- | source4/lib/events/events_timed.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source4/lib/events/events_timed.c b/source4/lib/events/events_timed.c index 389c2cbbb7..79e4cde795 100644 --- a/source4/lib/events/events_timed.c +++ b/source4/lib/events/events_timed.c @@ -20,12 +20,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#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/select.h" -#include "lib/util/dlinklist.h" -#include "lib/events/events.h" -#include "lib/events/events_internal.h" +#include "events.h" +#include "events_internal.h" /* destroy a timed event |