From d40fe50a6755ab701f2fe8a434f1d3331769a4c0 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 20 Sep 2011 14:26:36 -0700
Subject: build: avoid util.h as a public header name due to conflict with
 MacOS

---
 source3/include/includes.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/include')

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"
-- 
cgit