diff options
author | Jeremy Allison <jra@samba.org> | 2008-12-18 15:40:05 -0800 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2008-12-18 15:40:05 -0800 |
commit | 4283ae489b6e227beba196e8a315a9727f03cc07 (patch) | |
tree | 7308561653b9e52eab8fc13181c0ad41ae2da208 /source4/cluster/ctdb | |
parent | f9bb8fbe832409893b17f2113d7b35b9ffe91540 (diff) | |
parent | d031472227b44d040698e6dff52dc79028fde854 (diff) | |
download | samba-4283ae489b6e227beba196e8a315a9727f03cc07.tar.gz samba-4283ae489b6e227beba196e8a315a9727f03cc07.tar.bz2 samba-4283ae489b6e227beba196e8a315a9727f03cc07.zip |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source4/cluster/ctdb')
-rw-r--r-- | source4/cluster/ctdb/common/ctdb_ltdb.c | 1 | ||||
-rw-r--r-- | source4/cluster/ctdb/common/ctdb_message.c | 1 | ||||
-rw-r--r-- | source4/cluster/ctdb/common/ctdb_util.c | 1 | ||||
-rw-r--r-- | source4/cluster/ctdb/config.mk | 2 | ||||
-rw-r--r-- | source4/cluster/ctdb/ctdb_cluster.c | 1 |
5 files changed, 1 insertions, 5 deletions
diff --git a/source4/cluster/ctdb/common/ctdb_ltdb.c b/source4/cluster/ctdb/common/ctdb_ltdb.c index e9ee55f6a7..1673368860 100644 --- a/source4/cluster/ctdb/common/ctdb_ltdb.c +++ b/source4/cluster/ctdb/common/ctdb_ltdb.c @@ -18,7 +18,6 @@ */ #include "includes.h" -#include "lib/events/events.h" #include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" diff --git a/source4/cluster/ctdb/common/ctdb_message.c b/source4/cluster/ctdb/common/ctdb_message.c index 323e90c9e0..54f8e2ac1a 100644 --- a/source4/cluster/ctdb/common/ctdb_message.c +++ b/source4/cluster/ctdb/common/ctdb_message.c @@ -21,7 +21,6 @@ protocol design and packet details */ #include "includes.h" -#include "lib/events/events.h" #include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" diff --git a/source4/cluster/ctdb/common/ctdb_util.c b/source4/cluster/ctdb/common/ctdb_util.c index 67eb32221a..f6389c449f 100644 --- a/source4/cluster/ctdb/common/ctdb_util.c +++ b/source4/cluster/ctdb/common/ctdb_util.c @@ -18,7 +18,6 @@ */ #include "includes.h" -#include "lib/events/events.h" #include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" diff --git a/source4/cluster/ctdb/config.mk b/source4/cluster/ctdb/config.mk index 28b18c17ce..d164d710df 100644 --- a/source4/cluster/ctdb/config.mk +++ b/source4/cluster/ctdb/config.mk @@ -12,7 +12,7 @@ opendb_ctdb_OBJ_FILES = $(ctdbsrcdir)/opendb_ctdb.o ################## [SUBSYSTEM::ctdb] -PUBLIC_DEPENDENCIES = TDB_WRAP LIBTALLOC +PUBLIC_DEPENDENCIES = TDB_WRAP LIBTALLOC LIBEVENTS ctdb_OBJ_FILES = $(addprefix $(ctdbsrcdir)/, \ ctdb_cluster.o \ diff --git a/source4/cluster/ctdb/ctdb_cluster.c b/source4/cluster/ctdb/ctdb_cluster.c index 1c96319986..9b0c9a8aa4 100644 --- a/source4/cluster/ctdb/ctdb_cluster.c +++ b/source4/cluster/ctdb/ctdb_cluster.c @@ -20,7 +20,6 @@ */ #include "includes.h" -#include "lib/events/events.h" #include "cluster/cluster.h" #include "system/filesys.h" #include "cluster/cluster_private.h" |