r1902: we need to include popt.h before popt_common.h

metze
(This used to be commit edde7497e9e06be0e51e886981725271a85bd9e5)

diff --git a/source4/include/includes.h b/source4/include/includes.h
index c4b8f24397e287a6d41b69875277f33cfa9310bc..c67b3c819559d379d7e7e8b51f7024ca3d404532 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -653,8 +653,6 @@ extern int errno;
 
 #include "asn_1.h"
 
-#include "popt.h"
-
 #include "mutex.h"
 
 #include "librpc/rpc/dcerpc.h"

diff --git a/source4/include/rewrite.h b/source4/include/rewrite.h
index 21cc7342d1c06674dfdbfe9ac151c28a3ea6a356..5e2f9bb4bcad9e1997a7be0b50facd47db6b6004 100644 (file)
--- a/source4/include/rewrite.h
+++ b/source4/include/rewrite.h
@@ -280,6 +280,7 @@ typedef struct {
        char *from_name, *to_name;
 } *smb_iconv_t;
 
+#include "popt.h"
 #include "popt_common.h"
 
 #endif /* _REWRITE_H */