summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/rfc1738.c2
-rw-r--r--lib/util/samba_util.h (renamed from lib/util/util.h)0
-rwxr-xr-xlib/util/wscript_build4
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/util/rfc1738.c b/lib/util/rfc1738.c
index b45310a34b..c8f0472541 100644
--- a/lib/util/rfc1738.c
+++ b/lib/util/rfc1738.c
@@ -50,7 +50,7 @@
#include "includes.h"
-#include "util.h"
+#include "lib/util/samba_util.h"
/*
* RFC 1738 defines that these characters should be escaped, as well
diff --git a/lib/util/util.h b/lib/util/samba_util.h
index 9a76fa9f04..9a76fa9f04 100644
--- a/lib/util/util.h
+++ b/lib/util/samba_util.h
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 553748a22e..70a639d2d7 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -10,8 +10,8 @@ bld.SAMBA_LIBRARY('samba-util',
server_id.c dprintf.c parmlist.c bitmap.c''',
deps='DYNCONFIG',
public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO charset',
- public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h',
- header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
+ public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
+ header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
local_include=False,
vnum='0.0.1',
pc_files='samba-util.pc'