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/torture | |
| 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/torture')
| -rw-r--r-- | source4/torture/basic/utable.c | 2 | ||||
| -rw-r--r-- | source4/torture/local/config.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c index 9e8ee6ced8..7a2b3874e0 100644 --- a/source4/torture/basic/utable.c +++ b/source4/torture/basic/utable.c @@ -20,8 +20,8 @@ #include "includes.h" #include "torture/torture.h" -#include "system/iconv.h" #include "system/filesys.h" +#include "system/locale.h" #include "libcli/libcli.h" #include "torture/util.h" #include "pstring.h" diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 28d231ebe5..b98c3b3516 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -21,6 +21,7 @@ PUBLIC_DEPENDENCIES = \ RPC_NDR_ECHO \ LIBCLI_SMB \ MESSAGING \ + ICONV \ registry # End SUBSYSTEM TORTURE_LOCAL ################################# |