summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-08-19 07:54:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:09 -0500
commit045bdb356f3f35ca65279d55cedad45fc65185e8 (patch)
tree89d802a363dfc1823f9d20fd9dec5e1187b084b5
parent838c208ab1531814579191472d7427c89b231296 (diff)
downloadsamba-045bdb356f3f35ca65279d55cedad45fc65185e8.tar.gz
samba-045bdb356f3f35ca65279d55cedad45fc65185e8.tar.bz2
samba-045bdb356f3f35ca65279d55cedad45fc65185e8.zip
r1902: we need to include popt.h before popt_common.h
metze (This used to be commit edde7497e9e06be0e51e886981725271a85bd9e5)
-rw-r--r--source4/include/includes.h2
-rw-r--r--source4/include/rewrite.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index c4b8f24397..c67b3c8195 100644
--- 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 21cc7342d1..5e2f9bb4bc 100644
--- 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 */