summaryrefslogtreecommitdiff
path: root/librpc
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-09-20 14:26:36 -0700
committerAndrew Bartlett <abartlet@samba.org>2011-09-23 09:24:03 +0200
commitd40fe50a6755ab701f2fe8a434f1d3331769a4c0 (patch)
tree52a3d1e3129646303f17e661a29d7ad7db4e2be7 /librpc
parent4383665101db5c2ddb37d5c90ee9304e468b0310 (diff)
downloadsamba-d40fe50a6755ab701f2fe8a434f1d3331769a4c0.tar.gz
samba-d40fe50a6755ab701f2fe8a434f1d3331769a4c0.tar.bz2
samba-d40fe50a6755ab701f2fe8a434f1d3331769a4c0.zip
build: avoid util.h as a public header name due to conflict with MacOS
Diffstat (limited to 'librpc')
-rw-r--r--librpc/ndr/libndr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index c8edfdac39..80b0ec9182 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -27,7 +27,7 @@
#include <talloc.h>
#include <sys/time.h>
-#include "../lib/util/util.h" /* for discard_const */
+#include "../lib/util/samba_util.h" /* for discard_const */
#include "../lib/util/charset/charset.h"
/*