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/utils | |
| 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/utils')
| -rw-r--r-- | source4/utils/ndrdump.c | 2 | ||||
| -rw-r--r-- | source4/utils/nmblookup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/utils/ndrdump.c b/source4/utils/ndrdump.c index 117029b6bc..86a32e9d5b 100644 --- a/source4/utils/ndrdump.c +++ b/source4/utils/ndrdump.c @@ -20,8 +20,8 @@ #include "includes.h" #include "lib/cmdline/popt_common.h" -#include "system/iconv.h" #include "system/filesys.h" +#include "system/locale.h" #include "librpc/rpc/dcerpc.h" #include "librpc/rpc/dcerpc_table.h" diff --git a/source4/utils/nmblookup.c b/source4/utils/nmblookup.c index 400201f083..b9057d4934 100644 --- a/source4/utils/nmblookup.c +++ b/source4/utils/nmblookup.c @@ -24,9 +24,9 @@ #include "includes.h" #include "lib/cmdline/popt_common.h" -#include "system/iconv.h" #include "lib/socket/socket.h" #include "system/network.h" +#include "system/locale.h" #include "netif/netif.h" #include "librpc/gen_ndr/nbt.h" #include "libcli/nbt/libnbt.h" |