Move some headers around to avoid confusion.

Signed-off-by: Günther Deschner <gd@samba.org>

diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index 7e41812789e4d292c7f83637fb6168e0130489e9..8824a7c376c44bdd22d74cfbfbcee11b1adc7645 100644 (file)
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -29,7 +29,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli_proto.h"
 #include "libgpo/ads_convenience.h"
-#include "libgpo/gpo.h"
+#include "libgpo/gpo_s4.h"
 #endif
 
 /****************************************************************

diff --git a/libgpo/gpo_ldap.c b/libgpo/gpo_ldap.c
index 0959ed6b387535bc7d7f602d003d32591de6182a..a884198ed5b7b9f6b974d21d1709474ab310aa09 100644 (file)
--- a/libgpo/gpo_ldap.c
+++ b/libgpo/gpo_ldap.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #if _SAMBA_BUILD_ == 4
 #include "libgpo/gpo.h"
+#include "libgpo/gpo_s4.h"
 #include "source4/libgpo/ads_convenience.h"
 #endif
 

diff --git a/source4/libgpo/gpo_s4.h b/source4/libgpo/gpo_s4.h
index 3e5cb06bdc607a7b88eaa2b430b3b3c3b49e5e67..f616f6bd320647097d240ab6a6d1ebfcf2bdac31 100644 (file)
--- a/source4/libgpo/gpo_s4.h
+++ b/source4/libgpo/gpo_s4.h
@@ -20,8 +20,12 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __LIBGPO_GPO_H__
-#define __LIBGPO_GPO_H__
+#ifndef __LIBGPO_GPO_S4_H__
+#define __LIBGPO_GPO_S4_H__
+
+#if _SAMBA_BUILD_ == 4
+#include "source4/libcli/libcli.h"
+#endif
 
 NTSTATUS gpo_copy_file(TALLOC_CTX *mem_ctx,
                       struct smbcli_state *cli,