librpc/ndr remove _SAMBA_BUILD_ conditionals

diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index ca3710bc986a95c96cc924adfe184cd1cf277b23..1f65ab4813c24bd53f56f2b9c8c8c3ed06449ebf 100644 (file)
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -27,10 +27,8 @@
 
 #include <talloc.h>
 #include <sys/time.h>
-#if _SAMBA_BUILD_ == 4
 #include "../lib/util/util.h" /* for discard_const */
 #include "../lib/util/charset/charset.h"
-#endif
 
 /*
   this provides definitions for the libcli/rpc/ MSRPC library

diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index 56d1fab05e4b2b778f558eb84d8eff204dfeacc5..7cb6e214ba3aa0fc5c15e45088aebb49305061ef 100644 (file)
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -29,9 +29,6 @@
 #include "includes.h"
 #include "librpc/ndr/libndr.h"
 #include "../lib/util/dlinklist.h"
-#if _SAMBA_BUILD_ == 4
-#include "param/param.h"
-#endif
 
 #define NDR_BASE_MARSHALL_SIZE 1024
 

diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c
index 14fb222f4ac3487c9472d92e771a5b996b36f202..8104ffde00c80bd0ca2ee693eb32a00cb3e0cd04 100644 (file)
--- a/librpc/ndr/ndr_spoolss_buf.c
+++ b/librpc/ndr/ndr_spoolss_buf.c
@@ -25,9 +25,6 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_spoolss.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#if (_SAMBA_BUILD_ >= 4)
-#include "param/param.h"
-#endif
 
 #define NDR_SPOOLSS_PUSH_ENUM_IN(fn) do { \
        if (!r->in.buffer && r->in.offered != 0) {\