summaryrefslogtreecommitdiff
path: root/source4/lib/util
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-05-13 19:14:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:58 -0500
commit172a83d72491f90f6191be1040ef8b2e1789bd2e (patch)
tree9407540663c3462c525c36a383b23b61963ceceb /source4/lib/util
parent53f005f6aaa2aa2eb599e6787e2c700a1d44d2a2 (diff)
downloadsamba-172a83d72491f90f6191be1040ef8b2e1789bd2e.tar.gz
samba-172a83d72491f90f6191be1040ef8b2e1789bd2e.tar.bz2
samba-172a83d72491f90f6191be1040ef8b2e1789bd2e.zip
r15573: Fix build of systems that have iconv headers in non-standard locations
Split of system/locale.h header from system/iconv.h Previously, iconv wasn't being used on these systems (This used to be commit aa6d66fda69779d1c2948a1aca85dbd5208f1cba)
Diffstat (limited to 'source4/lib/util')
-rw-r--r--source4/lib/util/genrand.c2
-rw-r--r--source4/lib/util/util.c2
-rw-r--r--source4/lib/util/util_str.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/util/genrand.c b/source4/lib/util/genrand.c
index 5bdf1f7e08..8424ad8fd7 100644
--- a/source4/lib/util/genrand.c
+++ b/source4/lib/util/genrand.c
@@ -21,9 +21,9 @@
*/
#include "includes.h"
-#include "system/iconv.h"
#include "system/filesys.h"
#include "lib/crypto/crypto.h"
+#include "system/locale.h"
/**
* @file
diff --git a/source4/lib/util/util.c b/source4/lib/util/util.c
index c674ed23b4..5948cd7ecb 100644
--- a/source4/lib/util/util.c
+++ b/source4/lib/util/util.c
@@ -24,8 +24,8 @@
#include "includes.h"
#include "system/network.h"
-#include "system/iconv.h"
#include "system/filesys.h"
+#include "system/locale.h"
/**
* @file
diff --git a/source4/lib/util/util_str.c b/source4/lib/util/util_str.c
index ec6a1cbbea..62869198c3 100644
--- a/source4/lib/util/util_str.c
+++ b/source4/lib/util/util_str.c
@@ -26,7 +26,7 @@
#include "smb.h"
#include "pstring.h"
#include "lib/ldb/include/ldb.h"
-#include "system/iconv.h"
+#include "system/locale.h"
/**
* @file