[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Tue Sep 25 18:14:02 MDT 2012
The branch, master has been updated
via 3902e73 lib/util/charset: We do not use fucntions from wchar.h any more
via 1c5c96d lib/util/charset: Try to find iconv on HP-UX
via 6146b60 wscript: Removed executable bit.
from 7600fd8 s3: Factor out calculate_open_access_flags
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3902e7332d3d79c257fca451635d08a58d327d70
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Sep 26 08:10:29 2012 +1000
lib/util/charset: We do not use fucntions from wchar.h any more
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Wed Sep 26 02:13:10 CEST 2012 on sn-devel-104
commit 1c5c96d7cd63ad1d46fb120119c5ad6594e103cf
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Sep 26 07:41:38 2012 +1000
lib/util/charset: Try to find iconv on HP-UX
commit 6146b609e7add16a34067a4c40902f63d19fe5fe
Author: Ricky Nance <ricky.nance at weaubleau.k12.mo.us>
Date: Tue Sep 25 01:10:42 2012 -0500
wscript: Removed executable bit.
Removed the executable for both wscript and wscript_build.
-----------------------------------------------------------------------
Summary of changes:
lib/util/charset/wscript_configure | 11 ++++-------
source3/passdb/pdb_nds.c | 1 -
source3/registry/reg_parse.c | 1 -
3 files changed, 4 insertions(+), 9 deletions(-)
mode change 100755 => 100644 wscript
mode change 100755 => 100644 wscript_build
Changeset truncated at 500 lines:
diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure
index 98756fe..804c266 100644
--- a/lib/util/charset/wscript_configure
+++ b/lib/util/charset/wscript_configure
@@ -10,12 +10,9 @@
conf.CHECK_LIB(libs="iconv", shlib=True)
+#HP-UX can use libiconv as an add-on package, which has #define iconv_open libiconv_open
if (conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=False, headers='iconv.h') or
+ 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 3e1bdfc..cce4937 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 babf5c0..c276c7e 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>
diff --git a/wscript b/wscript
old mode 100755
new mode 100644
diff --git a/wscript_build b/wscript_build
old mode 100755
new mode 100644
--
Samba Shared Repository
More information about the samba-cvs
mailing list