Merge branch 'master' of ssh://git.samba.org/data/git/samba

[bbaumbach/samba-autobuild/.git] / source3 / include / includes.h

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 3f35602ba6ebd8e32df452979dba9433153428dc..8b0ff71c4ec4a0ac236cfe8e36bb379c4d49f3d2 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -559,7 +559,6 @@ typedef char fstring[FSTRING_LEN];
 #endif
 
 /* Samba 3 doesn't use iconv_convenience: */
-extern void *global_iconv_convenience;
 extern void *cmdline_lp_ctx;
 struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 
@@ -575,6 +574,8 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 
 #include "../talloc/talloc.h"
 
+#include "event.h"
+
 #include "../lib/util/data_blob.h"
 #include "../lib/util/time.h"
 #include "../lib/util/asn1.h"
@@ -643,7 +644,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "nsswitch/winbind_client.h"
 #include "spnego.h"
 #include "rpc_client.h"
-#include "event.h"
 #include "dbwrap.h"
 #include "packet.h"
 #include "ctdbd_conn.h"