Added some #ifndefs to stop files being included multiple times.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit fdca12c25e6fce6206135b994dedf44265e4eb09)

ctdb/common/rb_tree.h

@@ -17,8 +17,9 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-
-
+#ifndef _RB_TREE_H
+#define _RB_TREE_H
+ 
 #define TRBT_RED		0x00
 #define TRBT_BLACK		0x01
 typedef struct trbt_node {
@@ -85,3 +86,5 @@ int trbt_traversearray32(trbt_tree_t *tree, uint32_t keylen, int (*callback)(voi
 /* Lookup the first node in the tree with a key based on an array of uint32 
    and return a pointer to data or NULL */
 void *trbt_findfirstarray32(trbt_tree_t *tree, uint32_t keylen);
+
+#endif /* _RB_TREE_H */

ctdb/include/includes.h

@@ -1,3 +1,6 @@
+#ifndef _CTDB_INCLUDES_H
+#define _CTDB_INCLUDES_H
+
 #define HAVE_UNIXSOCKET 1
 
 #include "replace.h"
@@ -58,3 +61,5 @@ _PUBLIC_ int set_blocking(int fd, BOOL set);
 
 #include "lib/util/debug.h"
 #include "lib/util/util.h"
+
+#endif /* _CTDB_INCLUDES_H */

ctdb/lib/util/db_wrap.h

@@ -19,6 +19,8 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef _DB_WRAP_H
+#define _DB_WRAP_H
 
 struct tdb_wrap {
 	struct tdb_context *tdb;
@@ -30,3 +32,5 @@ struct tdb_wrap {
 struct tdb_wrap *tdb_wrap_open(TALLOC_CTX *mem_ctx,
 			       const char *name, int hash_size, int tdb_flags,
 			       int open_flags, mode_t mode);
+
+#endif /* _DB_WRAP_H */

ctdb/tcp/ctdb_tcp.h

@@ -17,7 +17,9 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-
+#ifndef _CTDB_TCP_H
+#define _CTDB_TCP_H
+ 
 /* ctdb_tcp main state */
 struct ctdb_tcp {
 	struct ctdb_context *ctdb;
@@ -54,3 +56,5 @@ void ctdb_tcp_tnode_cb(uint8_t *data, size_t cnt, void *private_data);
 void ctdb_tcp_stop_connection(struct ctdb_node *node);
 
 #define CTDB_TCP_ALIGNMENT 8
+
+#endif /* _CTDB_TCP_H */