From 84a8f0451d618ad05d451714f309ed3ab4acf57e Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Thu, 3 Jun 2010 09:57:50 +0200
Subject: [PATCH] s3-build: only include generated spoolss headers (not ndr
 headers).

Guenther
---
 source3/include/proto.h                 | 2 --
 source3/include/smb.h                   | 1 +
 source3/registry/reg_backend_printing.c | 1 +
 source3/rpc_client/init_spoolss.c       | 1 +
 source3/rpc_server/srv_spoolss_util.c   | 1 +
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5d8a99771f4..590f3fb7337 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2046,8 +2046,6 @@ ADS_STATUS ads_change_trust_account_password(ADS_STRUCT *ads, char *host_princip
 ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
 				       char **returned_principal);
 
-#include "librpc/gen_ndr/ndr_spoolss.h"
-
 /* The following definitions come from librpc/ndr/util.c  */
 
 enum ndr_err_code ndr_push_server_id(struct ndr_push *ndr, int ndr_flags, const struct server_id *r);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index ce8022ab217..d20a04ea974 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -201,6 +201,7 @@ typedef union unid_t {
 #include "librpc/gen_ndr/epmapper.h"
 #include "librpc/gen_ndr/krb5pac.h"
 #include "librpc/gen_ndr/dcerpc.h"
+#include "librpc/gen_ndr/spoolss.h"
 
 struct lsa_dom_info {
 	bool valid;
diff --git a/source3/registry/reg_backend_printing.c b/source3/registry/reg_backend_printing.c
index a874a62f9db..55606225b9b 100644
--- a/source3/registry/reg_backend_printing.c
+++ b/source3/registry/reg_backend_printing.c
@@ -24,6 +24,7 @@
 #include "reg_util_internal.h"
 #include "reg_backend_db.h"
 #include "reg_objects.h"
+#include "../librpc/gen_ndr/ndr_spoolss.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/rpc_client/init_spoolss.c b/source3/rpc_client/init_spoolss.c
index 737dbdc664f..1a96e17ed7b 100644
--- a/source3/rpc_client/init_spoolss.c
+++ b/source3/rpc_client/init_spoolss.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "rpc_client/init_spoolss.h"
+#include "../librpc/gen_ndr/ndr_spoolss.h"
 
 /*******************************************************************
 ********************************************************************/
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index 0ebe0ba109a..4c70ce4edb8 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "srv_spoolss_util.h"
+#include "../librpc/gen_ndr/ndr_spoolss.h"
 #include "../librpc/gen_ndr/srv_winreg.h"
 #include "../librpc/gen_ndr/cli_winreg.h"
 #include "../librpc/gen_ndr/ndr_security.h"
-- 
2.11.4.GIT