s3-build: only include rpc_misc.h where needed.

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 25920881123263a312c0b4ee2ca4d2af3fac4d25..478c633d6216c1e39bf114044fa6237a217cf14c 100644 (file)
--- 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 08ee5defcb8915457208d1b211a882379f17dcc3..adc80167cade5f54a30dbecfae16ce57469a5eb8 100644 (file)
--- 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 3300b6e3941fc078e2bd60fa632d299186e80ce8..d064f3d6e3e21b3b0abac1da4097acc20c3b3ade 100644 (file)
--- 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 287c720c59edf9bf26f16a1ba2cb2983748948cf..5df20d4f08341523e688e74ffdbe3538c76e4f25 100644 (file)
--- 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 198a84f2d8b7cbf56ec72405f8dfc139295e1310..de15f9f82f0728bbe78eae6d67c65b94c54aea05 100644 (file)
--- 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