summaryrefslogtreecommitdiffstats
path: root/source3/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/cluster_support.c18
-rw-r--r--source3/lib/ctdb_conn.c4
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"