diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-13 19:14:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:58 -0500 |
| commit | 172a83d72491f90f6191be1040ef8b2e1789bd2e (patch) | |
| tree | 9407540663c3462c525c36a383b23b61963ceceb /source4/lib/samba3 | |
| parent | 53f005f6aaa2aa2eb599e6787e2c700a1d44d2a2 (diff) | |
| download | samba-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/samba3')
| -rw-r--r-- | source4/lib/samba3/group.c | 1 | ||||
| -rw-r--r-- | source4/lib/samba3/smbpasswd.c | 2 | ||||
| -rw-r--r-- | source4/lib/samba3/tdbsam.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/source4/lib/samba3/group.c b/source4/lib/samba3/group.c index 13b21ed21f..0860c36e1f 100644 --- a/source4/lib/samba3/group.c +++ b/source4/lib/samba3/group.c @@ -20,7 +20,6 @@ */ #include "includes.h" -#include "system/iconv.h" #include "lib/samba3/samba3.h" #include "lib/tdb/include/tdbutil.h" #include "system/filesys.h" diff --git a/source4/lib/samba3/smbpasswd.c b/source4/lib/samba3/smbpasswd.c index e6c52966d9..acba763371 100644 --- a/source4/lib/samba3/smbpasswd.c +++ b/source4/lib/samba3/smbpasswd.c @@ -54,8 +54,8 @@ */ #include "includes.h" +#include "system/locale.h" #include "lib/samba3/samba3.h" -#include "system/iconv.h" /*! Convert 32 hex characters into a 16 byte array. */ diff --git a/source4/lib/samba3/tdbsam.c b/source4/lib/samba3/tdbsam.c index 80f1448d9c..148a3c90f5 100644 --- a/source4/lib/samba3/tdbsam.c +++ b/source4/lib/samba3/tdbsam.c @@ -21,7 +21,6 @@ */ #include "includes.h" -#include "system/iconv.h" #include "system/filesys.h" #include "lib/tdb/include/tdbutil.h" #include "lib/samba3/samba3.h" |