diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-10-10 14:25:34 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-10-28 05:42:04 +0100 |
| commit | e67c4b977a52d1744f4da8296bbcd7c213cbe92a (patch) | |
| tree | b5a4bf9397c28f3848d8460b8fced130e38cb572 /source3/lib | |
| parent | 0d5ecaa2e38b55e981cb2770a945d14ab1d98589 (diff) | |
| download | samba-e67c4b977a52d1744f4da8296bbcd7c213cbe92a.tar.gz samba-e67c4b977a52d1744f4da8296bbcd7c213cbe92a.tar.xz samba-e67c4b977a52d1744f4da8296bbcd7c213cbe92a.zip | |
build: Remove configure checks for ctdb headers
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/cluster_support.c | 18 | ||||
| -rw-r--r-- | source3/lib/ctdb_conn.c | 4 |
2 files changed, 1 insertions, 21 deletions
diff --git a/source3/lib/cluster_support.c b/source3/lib/cluster_support.c index afe2260917..6a5f91d1d3 100644 --- a/source3/lib/cluster_support.c +++ b/source3/lib/cluster_support.c @@ -20,18 +20,11 @@ #include <tdb.h> #include "cluster_support.h" -#ifdef HAVE_CTDB_H +#ifdef CLUSTER_SUPPORT #include <ctdb.h> -#define CLUSTER_SUPPORT 1 -#endif - -#ifdef HAVE_CTDB_PROTOCOL_H #include <ctdb_protocol.h> -#else -#ifdef HAVE_CTDB_PRIVATE_H #include <ctdb_private.h> #endif -#endif bool cluster_support_available(void) { @@ -53,15 +46,6 @@ const char *cluster_support_features(void) #else " NONE\n" #endif -#ifdef HAVE_CTDB_H - _LINE_DEF(HAVE_CTDB_H) -#endif -#ifdef HAVE_CTDB_PRIVATE_H - _LINE_DEF(HAVE_CTDB_PRIVATE_H) -#endif -#ifdef HAVE_CTDB_PROTOCOL_H - _LINE_DEF(HAVE_CTDB_PROTOCOL_H) -#endif #ifdef CTDB_SOCKET _LINE_STR(CTDB_SOCKET) #endif diff --git a/source3/lib/ctdb_conn.c b/source3/lib/ctdb_conn.c index 09965118d5..1bba8e7e82 100644 --- a/source3/lib/ctdb_conn.c +++ b/source3/lib/ctdb_conn.c @@ -23,11 +23,7 @@ #include <tdb.h> -#ifdef HAVE_CTDB_PROTOCOL_H #include <ctdb_protocol.h> -#else -#include <ctdb_private.h> -#endif #include "lib/async_req/async_sock.h" |