From 3aab0c701caa885a1256b07ab5ca7f9a51c6018b Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 20 Aug 2010 12:15:13 +0200
Subject: s3-build: only include rpc_misc.h where needed.

Guenther
---
 source3/include/includes.h          | 1 -
 source3/include/rpc_misc.h          | 2 --
 source3/librpc/rpc/dcerpc.h         | 2 ++
 source3/rpc_server/srv_spoolss_nt.c | 1 +
 source3/rpc_server/srv_winreg_nt.c  | 1 +
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 2592088112..478c633d62 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -641,7 +641,6 @@ extern void *cmdline_lp_ctx;
 #include "smb.h"
 #include "nameserv.h"
 #include "../lib/util/byteorder.h"
-#include "rpc_misc.h"
 #include "mapping.h"
 #include "passdb.h"
 #include "msdfs.h"
diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index 08ee5defcb..adc80167ca 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -23,8 +23,6 @@
 #ifndef _RPC_MISC_H /* _RPC_MISC_H */
 #define _RPC_MISC_H 
 
-#define SMB_RPC_INTERFACE_VERSION 1
-
 /********************************************************************** 
  * RPC policy handle used pretty much everywhere
  **********************************************************************/
diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index 3300b6e394..d064f3d6e3 100644
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -26,6 +26,8 @@
 #ifndef __DCERPC_H__
 #define __DCERPC_H__
 
+#define SMB_RPC_INTERFACE_VERSION 1
+
 enum dcerpc_transport_t {
 	NCA_UNKNOWN, NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC, 
 	NCACN_VNS_SPP, NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM, 
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 287c720c59..5df20d4f08 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -40,6 +40,7 @@
 #include "include/printing.h"
 #include "secrets.h"
 #include "../librpc/gen_ndr/netlogon.h"
+#include "rpc_misc.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \
diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c
index 198a84f2d8..de15f9f82f 100644
--- a/source3/rpc_server/srv_winreg_nt.c
+++ b/source3/rpc_server/srv_winreg_nt.c
@@ -25,6 +25,7 @@
 #include "registry/reg_parse_prs.h"
 #include "registry.h"
 #include "registry/reg_perfcount.h"
+#include "rpc_misc.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
-- 
cgit