summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-04-14 18:01:40 +0200
committerAndrew Bartlett <abartlet@samba.org>2008-04-14 18:01:40 +0200
commit3170ae538a201f1dfe4b6eb70047a31b344a866b (patch)
tree58e36e0c85cab643541c297f97bb1c6739a36feb /source4
parentb54e6a815514ef1e5a0a5d11ca43f85e0366b8dc (diff)
parent97e09c2f877779ca6d55684d33b1a24b8a280e51 (diff)
downloadsamba-3170ae538a201f1dfe4b6eb70047a31b344a866b.tar.gz
samba-3170ae538a201f1dfe4b6eb70047a31b344a866b.tar.bz2
samba-3170ae538a201f1dfe4b6eb70047a31b344a866b.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit f610862dc900cb3ddf0f275641bc3b66ad1f3bc4)
Diffstat (limited to 'source4')
-rw-r--r--source4/Makefile2
-rw-r--r--source4/lib/events/events.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/Makefile b/source4/Makefile
index 8c74b4899d..98c45a34ad 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -24,7 +24,7 @@ $(srcdir)/version.h: $(srcdir)/VERSION
.DEFAULT_GOAL := all
-ifneq ($(automatic_deps),yes)
+ifneq ($(automatic_dependencies),yes)
ALL_PREDEP = proto
.NOTPARALLEL:
endif
diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c
index 5d43a91161..568aadc31e 100644
--- a/source4/lib/events/events.c
+++ b/source4/lib/events/events.c
@@ -105,6 +105,7 @@ static void event_backend_init(void)
NTSTATUS s4_events_standard_init(void);
NTSTATUS s4_events_select_init(void);
NTSTATUS s4_events_epoll_init(void);
+ NTSTATUS s4_events_aio_init(void);
init_module_fn static_init[] = { STATIC_LIBEVENTS_MODULES };
if (event_backends) return;
run_init_functions(static_init);