summaryrefslogtreecommitdiff
path: root/source4/param
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/param
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/param')
-rw-r--r--source4/param/loadparm.c2
-rw-r--r--source4/param/params.c2
-rw-r--r--source4/param/util.c1
3 files changed, 2 insertions, 3 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index b6dec9be9d..c46cf51f4b 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -58,7 +58,7 @@
#include "dynconfig.h"
#include "pstring.h"
#include "system/time.h"
-#include "system/iconv.h"
+#include "system/locale.h"
#include "librpc/gen_ndr/svcctl.h"
#include "librpc/gen_ndr/samr.h"
#include "smb_server/smb_server.h"
diff --git a/source4/param/params.c b/source4/param/params.c
index 0ce416c00a..1680df4e4f 100644
--- a/source4/param/params.c
+++ b/source4/param/params.c
@@ -80,7 +80,7 @@
*/
#include "includes.h"
-#include "system/iconv.h"
+#include "system/locale.h"
/* -------------------------------------------------------------------------- **
* Constants...
diff --git a/source4/param/util.c b/source4/param/util.c
index dc605191fe..af97903277 100644
--- a/source4/param/util.c
+++ b/source4/param/util.c
@@ -25,7 +25,6 @@
#include "includes.h"
#include "dynconfig.h"
#include "system/network.h"
-#include "system/iconv.h"
#include "system/filesys.h"
/**