summaryrefslogtreecommitdiff
path: root/source3/include/includes.h
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 /source3/include/includes.h
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 'source3/include/includes.h')
-rw-r--r--source3/include/includes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index ac29b7d901..b644089712 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -498,7 +498,7 @@ typedef char fstring[FSTRING_LEN];
#endif
/* Lists, trees, caching, database... */
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
#include "../lib/util/util_net.h"
#include "../lib/util/xfile.h"
#include "../lib/util/memory.h"