summaryrefslogtreecommitdiff
path: root/librpc/ndr
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@jelmer.uk>2015-12-28 22:21:11 +0000
committerJelmer Vernooij <jelmer@samba.org>2016-01-13 04:43:23 +0100
commitffbd9c4584d83c56e58901bc91effa75ebdcbb02 (patch)
tree549d02228f1a30d40031d271b7e6e2904025c8a8 /librpc/ndr
parent512d15de56ed3f5a0abf9a7b98934ed42f211306 (diff)
downloadsamba-ffbd9c4584d83c56e58901bc91effa75ebdcbb02.tar.gz
Add a new header file for functions in lib/util/util.c.
This allows public headers to not include samba_util.h, but rather specific header files under lib/util. Signed-Off-By: Jelmer Vernooij <jelmer@samba.org> Reviewed-By: Andrew Bartlett <abartlet@samba.org> Reviewed-By: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'librpc/ndr')
-rw-r--r--librpc/ndr/libndr.h6
-rw-r--r--librpc/ndr/ndr_basic.c1
2 files changed, 5 insertions, 2 deletions
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 5c1487be203..c6116ed8119 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -26,8 +26,10 @@
#define __LIBNDR_H__
#include <talloc.h>
-#include <sys/time.h>
-#include "../lib/util/samba_util.h" /* for discard_const */
+#include "../lib/util/memory.h" /* for discard_const */
+#include "../lib/util/byteorder.h"
+#include "../lib/util/data_blob.h"
+#include "../lib/util/time.h"
#include "../lib/util/charset/charset.h"
/*
diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index ecc0f74fbe7..b532cc55b43 100644
--- a/librpc/ndr/ndr_basic.c
+++ b/librpc/ndr/ndr_basic.c
@@ -24,6 +24,7 @@
#include "librpc/ndr/libndr.h"
#include "lib/util/util_net.h"
#include "lib/util/debug.h"
+#include "lib/util/util.h"
#define NDR_SVAL(ndr, ofs) (NDR_BE(ndr)?RSVAL(ndr->data,ofs):SVAL(ndr->data,ofs))
#define NDR_IVAL(ndr, ofs) (NDR_BE(ndr)?RIVAL(ndr->data,ofs):IVAL(ndr->data,ofs))