diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-09-26 08:10:29 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-09-26 02:13:10 +0200 |
| commit | 3902e7332d3d79c257fca451635d08a58d327d70 (patch) | |
| tree | e557e219d8d95a4265086fd00f81ecc63e8f9416 | |
| parent | 1c5c96d7cd63ad1d46fb120119c5ad6594e103cf (diff) | |
| download | samba-3902e7332d3d79c257fca451635d08a58d327d70.tar.gz samba-3902e7332d3d79c257fca451635d08a58d327d70.tar.bz2 samba-3902e7332d3d79c257fca451635d08a58d327d70.zip | |
lib/util/charset: We do not use fucntions from wchar.h any more
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Sep 26 02:13:10 CEST 2012 on sn-devel-104
| -rw-r--r-- | lib/util/charset/wscript_configure | 8 | ||||
| -rw-r--r-- | source3/passdb/pdb_nds.c | 1 | ||||
| -rw-r--r-- | source3/registry/reg_parse.c | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure index dc197c1244..804c2663f6 100644 --- a/lib/util/charset/wscript_configure +++ b/lib/util/charset/wscript_configure @@ -15,10 +15,4 @@ if (conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=False, headers='iconv.h conf.CHECK_FUNCS_IN('libiconv_open', 'iconv', checklibc=False, headers='iconv.h') or conf.CHECK_FUNCS('iconv_open', headers='iconv.h')): - if conf.env['HAVE_LIBICONV']: - if conf.CHECK_FUNCS('mbrtowc', headers='wchar.h'): - conf.DEFINE('HAVE_NATIVE_ICONV', 1) - elif conf.env.LIB_ICONV: - del conf.env['LIB_ICONV'] - else: - conf.DEFINE('HAVE_NATIVE_ICONV', 1) + conf.DEFINE('HAVE_NATIVE_ICONV', 1) diff --git a/source3/passdb/pdb_nds.c b/source3/passdb/pdb_nds.c index 3e1bdfc151..cce4937ac9 100644 --- a/source3/passdb/pdb_nds.c +++ b/source3/passdb/pdb_nds.c @@ -23,7 +23,6 @@ #include <lber.h> #include <ldap.h> -#include <wchar.h> #include "smbldap.h" #include "passdb/pdb_ldap.h" diff --git a/source3/registry/reg_parse.c b/source3/registry/reg_parse.c index babf5c015e..c276c7e2d6 100644 --- a/source3/registry/reg_parse.c +++ b/source3/registry/reg_parse.c @@ -34,7 +34,6 @@ #include "reg_format.h" #include <stdio.h> -#include <wchar.h> #include <talloc.h> #include <stdbool.h> #include <string.h> |