diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-06 12:08:52 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-06 12:23:40 +1000 |
| commit | c1f8a743201746ccbcd1af5e6f410b2b922c00ba (patch) | |
| tree | 5320b8623f647d55f347bdacba49f861f6d69c8c | |
| parent | 4ccac7030ad24a9053e76eeb391c9e5e8f730343 (diff) | |
| download | samba-c1f8a743201746ccbcd1af5e6f410b2b922c00ba.tar.gz samba-c1f8a743201746ccbcd1af5e6f410b2b922c00ba.tar.bz2 samba-c1f8a743201746ccbcd1af5e6f410b2b922c00ba.zip | |
librpc/ndr remove _SAMBA_BUILD_ conditionals
| -rw-r--r-- | librpc/ndr/libndr.h | 2 | ||||
| -rw-r--r-- | librpc/ndr/ndr.c | 3 | ||||
| -rw-r--r-- | librpc/ndr/ndr_spoolss_buf.c | 3 |
3 files changed, 0 insertions, 8 deletions
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index ca3710bc98..1f65ab4813 100644 --- 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 56d1fab05e..7cb6e214ba 100644 --- 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 14fb222f4a..8104ffde00 100644 --- 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) {\ |