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

diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure
index dc197c12441d69caff38db943cb256de06c2c4ee..804c2663f640cc361c22a2446615eab1ae2c8c1f 100644 (file)
--- 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 3e1bdfc15147727c9fca52ba77a47f33cfad01c6..cce4937ac9d110d209b0151bb99e1c232ebc2034 100644 (file)
--- 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 babf5c015e15688bea35d814141498815edd849b..c276c7e2d623baf6171d03a6ed82955feacb608a 100644 (file)
--- 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>