From a154ed72913124806d3ff7322bceb36a06c53e79 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 19 Aug 2004 07:56:55 +0000
Subject: r1903: hmm a better solution is to include popt.h where it is needed

metze
(This used to be commit 64d61ef4a5b44e76c90914ebaeaafac58228d78c)
---
 source4/include/popt_common.h | 2 ++
 source4/include/rewrite.h     | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

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 */
-- 
cgit