s3: Remove a bunch of calls to procid_self()

[ira/wip.git] / source3 / lib / messages_ctdbd.c

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 3140f65510d4954e278ae8ade7369b43c4b05a6c..b7db2a76f094bbd85646bbf959adc3856c4c1f54 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -23,6 +23,24 @@
 
 #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
+ * warnings.
+ */
+
+#ifdef typesafe_cb
+#undef typesafe_cb
+#endif
+
+#ifdef typesafe_cb_preargs
+#undef typesafe_cb_preargs
+#endif
+
+#ifdef typesafe_cb_postargs
+#undef typesafe_cb_postargs
+#endif
+
 #include "ctdb.h"
 #include "ctdb_private.h"
 #include "ctdbd_conn.h"
@@ -51,7 +69,7 @@ struct ctdbd_connection *messaging_ctdbd_connection(void)
                        DEBUG(0,("event_context_init failed\n"));
                }
 
-               msg = messaging_init(NULL, procid_self(), ev);
+               msg = messaging_init(NULL, ev);
                if (!msg) {
                        DEBUG(0,("messaging_init failed\n"));
                        return NULL;