diff options
author | Stefan Metzmacher <metze@samba.org> | 2014-01-21 15:26:28 +0100 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2014-03-24 17:09:11 +0100 |
commit | e93b85dbd871d5d56a7bc13235820c488a41266f (patch) | |
tree | 0e6a97244dd33404fba6d40030f8e3f2d34b612e /source3/lib | |
parent | 91e56961fd2a66378fab4d91245365441e546ab3 (diff) | |
download | samba-e93b85dbd871d5d56a7bc13235820c488a41266f.tar.gz samba-e93b85dbd871d5d56a7bc13235820c488a41266f.tar.xz samba-e93b85dbd871d5d56a7bc13235820c488a41266f.zip |
s3:wscript: only build ctdb_dummy.c if we have no cluster support
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/lib')
-rw-r--r-- | source3/lib/ctdb_conn.c | 4 | ||||
-rw-r--r-- | source3/lib/ctdb_dummy.c | 4 | ||||
-rw-r--r-- | source3/lib/ctdbd_conn.c | 4 | ||||
-rw-r--r-- | source3/lib/dbwrap/dbwrap_ctdb.c | 4 | ||||
-rw-r--r-- | source3/lib/messages_ctdbd.c | 4 |
5 files changed, 0 insertions, 20 deletions
diff --git a/source3/lib/ctdb_conn.c b/source3/lib/ctdb_conn.c index 214ea9799ae..09965118d5d 100644 --- a/source3/lib/ctdb_conn.c +++ b/source3/lib/ctdb_conn.c @@ -21,8 +21,6 @@ #include "lib/util/tevent_unix.h" #include "ctdb_conn.h" -#ifdef CLUSTER_SUPPORT - #include <tdb.h> #ifdef HAVE_CTDB_PROTOCOL_H @@ -553,5 +551,3 @@ int ctdb_msg_read_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, *pmsg_len = msg->datalen; return 0; } - -#endif diff --git a/source3/lib/ctdb_dummy.c b/source3/lib/ctdb_dummy.c index e2b7c17e4c6..4b360a8b06f 100644 --- a/source3/lib/ctdb_dummy.c +++ b/source3/lib/ctdb_dummy.c @@ -25,8 +25,6 @@ #include "lib/dbwrap/dbwrap_ctdb.h" #include "torture/proto.h" -#ifndef CLUSTER_SUPPORT - NTSTATUS ctdbd_probe(void) { return NT_STATUS_NOT_IMPLEMENTED; @@ -180,5 +178,3 @@ bool run_ctdb_conn(int dummy) { return true; } - -#endif diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index ae4f7bbfba3..bde9dae76bb 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -23,8 +23,6 @@ #include "serverid.h" #include "ctdbd_conn.h" -#ifdef CLUSTER_SUPPORT - #include "ctdb_packet.h" #include "messages.h" @@ -1885,5 +1883,3 @@ NTSTATUS ctdbd_probe(void) return status; } - -#endif diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index 42c9a684261..b1133445342 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -27,8 +27,6 @@ #include "dbwrap/dbwrap_rbt.h" #include "lib/param/param.h" -#ifdef CLUSTER_SUPPORT - /* * It is not possible to include ctdb.h and tdb_compat.h (included via * some other include above) without warnings. This fixes those @@ -1709,5 +1707,3 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, return result; } - -#endif diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c index 200734da9a3..230560f8cfe 100644 --- a/source3/lib/messages_ctdbd.c +++ b/source3/lib/messages_ctdbd.c @@ -21,8 +21,6 @@ #include "messages.h" #include "util_tdb.h" -#ifdef CLUSTER_SUPPORT - /* * It is not possible to include ctdb.h and tdb_compat.h (included via * some other include above) without warnings. This fixes those @@ -168,5 +166,3 @@ NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx, *presult = result; return NT_STATUS_OK; } - -#endif |