diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-10-08 13:35:41 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-03-24 17:09:10 +0100 |
| commit | 4574602057d7645d673d1cddeb1941677b797f82 (patch) | |
| tree | 6dccd064804e4884387a90e2a102f8d37f4c655c /source3/lib | |
| parent | 47dbd4ef60e58e3b4512a151dabd63f1d0ea840d (diff) | |
| download | samba-4574602057d7645d673d1cddeb1941677b797f82.tar.gz samba-4574602057d7645d673d1cddeb1941677b797f82.tar.xz samba-4574602057d7645d673d1cddeb1941677b797f82.zip | |
s3:ctdb_conn: only use ctdb_protocol.h or ctdb_private.h in ctdb_conn.c
We don't need them in ctdb_conn.h.
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 | 8 | ||||
| -rw-r--r-- | source3/lib/ctdb_conn.h | 17 |
2 files changed, 9 insertions, 16 deletions
diff --git a/source3/lib/ctdb_conn.c b/source3/lib/ctdb_conn.c index 8e21b9a704b..214ea9799ae 100644 --- a/source3/lib/ctdb_conn.c +++ b/source3/lib/ctdb_conn.c @@ -23,6 +23,14 @@ #ifdef CLUSTER_SUPPORT +#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" struct ctdb_conn { diff --git a/source3/lib/ctdb_conn.h b/source3/lib/ctdb_conn.h index 0d648c78b8c..21a69c76718 100644 --- a/source3/lib/ctdb_conn.h +++ b/source3/lib/ctdb_conn.h @@ -20,26 +20,11 @@ #ifndef _CTDB_CONN_H #define _CTDB_CONN_H -#ifdef CLUSTER_SUPPORT - -#include <tdb.h> - -#ifdef HAVE_CTDB_PROTOCOL_H -#include <ctdb_protocol.h> -#else -#include <ctdb_private.h> -#endif - -#else /* CLUSTER_SUPPORT */ - -struct ctdb_reply_control; - -#endif /* CLUSTER_SUPPORT */ - #include "tevent.h" #include "librpc/gen_ndr/messaging.h" struct ctdb_conn; +struct ctdb_reply_control; struct tevent_req *ctdb_conn_control_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, |