summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-08-19 07:56:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:10 -0500
commita154ed72913124806d3ff7322bceb36a06c53e79 (patch)
tree23e30a1d20bdcc86a57ce071f4faccd4f6612a17
parent045bdb356f3f35ca65279d55cedad45fc65185e8 (diff)
downloadsamba-a154ed72913124806d3ff7322bceb36a06c53e79.tar.gz
samba-a154ed72913124806d3ff7322bceb36a06c53e79.tar.bz2
samba-a154ed72913124806d3ff7322bceb36a06c53e79.zip
r1903: hmm a better solution is to include popt.h where it is needed
metze (This used to be commit 64d61ef4a5b44e76c90914ebaeaafac58228d78c)
-rw-r--r--source4/include/popt_common.h2
-rw-r--r--source4/include/rewrite.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/include/popt_common.h b/source4/include/popt_common.h
index 57850bf682..201245cc3a 100644
--- a/source4/include/popt_common.h
+++ b/source4/include/popt_common.h
@@ -21,6 +21,8 @@
#ifndef _POPT_COMMON_H
#define _POPT_COMMON_H
+#include "popt.h"
+
/* Common popt structures */
extern struct poptOption popt_common_samba[];
extern struct poptOption popt_common_connection[];
diff --git a/source4/include/rewrite.h b/source4/include/rewrite.h
index 5e2f9bb4bc..21cc7342d1 100644
--- a/source4/include/rewrite.h
+++ b/source4/include/rewrite.h
@@ -280,7 +280,6 @@ typedef struct {
char *from_name, *to_name;
} *smb_iconv_t;
-#include "popt.h"
#include "popt_common.h"
#endif /* _REWRITE_H */