svn commit: samba r15573 - in branches/SAMBA_4_0/source:
include/system kdc lib/charset lib/ldb/include lib/replace
lib/samba3 lib/socket lib/tdb/tools lib/util libcli/ldap
libcli/nbt libcli/security ntvfs/posix param torture/basic
torture/local utils
jelmer at samba.org
jelmer at samba.org
Sat May 13 19:14:14 GMT 2006
Author: jelmer
Date: 2006-05-13 19:14:12 +0000 (Sat, 13 May 2006)
New Revision: 15573
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15573
Log:
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
Added:
branches/SAMBA_4_0/source/include/system/locale.h
Modified:
branches/SAMBA_4_0/source/include/system/config.m4
branches/SAMBA_4_0/source/include/system/iconv.h
branches/SAMBA_4_0/source/kdc/hdb-ldb.c
branches/SAMBA_4_0/source/lib/charset/util_unistr.c
branches/SAMBA_4_0/source/lib/ldb/include/includes.h
branches/SAMBA_4_0/source/lib/replace/replace.c
branches/SAMBA_4_0/source/lib/samba3/group.c
branches/SAMBA_4_0/source/lib/samba3/smbpasswd.c
branches/SAMBA_4_0/source/lib/samba3/tdbsam.c
branches/SAMBA_4_0/source/lib/socket/access.c
branches/SAMBA_4_0/source/lib/tdb/tools/tdbdump.c
branches/SAMBA_4_0/source/lib/util/genrand.c
branches/SAMBA_4_0/source/lib/util/util.c
branches/SAMBA_4_0/source/lib/util/util_str.c
branches/SAMBA_4_0/source/libcli/ldap/ldap.c
branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c
branches/SAMBA_4_0/source/libcli/nbt/nbtname.c
branches/SAMBA_4_0/source/libcli/security/sddl.c
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_shortname.c
branches/SAMBA_4_0/source/param/loadparm.c
branches/SAMBA_4_0/source/param/params.c
branches/SAMBA_4_0/source/param/util.c
branches/SAMBA_4_0/source/torture/basic/utable.c
branches/SAMBA_4_0/source/torture/local/config.mk
branches/SAMBA_4_0/source/utils/ndrdump.c
branches/SAMBA_4_0/source/utils/nmblookup.c
Changeset:
Modified: branches/SAMBA_4_0/source/include/system/config.m4
===================================================================
--- branches/SAMBA_4_0/source/include/system/config.m4 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/include/system/config.m4 2006-05-13 19:14:12 UTC (rev 15573)
@@ -30,7 +30,7 @@
# passwd
AC_CHECK_HEADERS(grp.h sys/id.h compat.h shadow.h sys/priv.h pwd.h sys/security.h)
-# iconv
+# locale
AC_CHECK_HEADERS(ctype.h locale.h)
# glob
Modified: branches/SAMBA_4_0/source/include/system/iconv.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/iconv.h 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/include/system/iconv.h 2006-05-13 19:14:12 UTC (rev 15573)
@@ -27,14 +27,6 @@
#include <giconv.h>
#endif
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
/* needed for some systems without iconv. Doesn't really matter
what error code we use */
#ifndef EILSEQ
Added: branches/SAMBA_4_0/source/include/system/locale.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/locale.h 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/include/system/locale.h 2006-05-13 19:14:12 UTC (rev 15573)
@@ -0,0 +1,29 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ locale include wrappers
+
+ Copyright (C) Andrew Tridgell 2004
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
Modified: branches/SAMBA_4_0/source/kdc/hdb-ldb.c
===================================================================
--- branches/SAMBA_4_0/source/kdc/hdb-ldb.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/kdc/hdb-ldb.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -38,7 +38,6 @@
#include "hdb.h"
#include "lib/ldb/include/ldb.h"
#include "lib/ldb/include/ldb_errors.h"
-#include "system/iconv.h"
#include "librpc/gen_ndr/netlogon.h"
#include "auth/auth.h"
#include "auth/auth_sam.h"
Modified: branches/SAMBA_4_0/source/lib/charset/util_unistr.c
===================================================================
--- branches/SAMBA_4_0/source/lib/charset/util_unistr.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/lib/charset/util_unistr.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -20,7 +20,7 @@
*/
#include "includes.h"
-#include "system/iconv.h"
+#include "system/locale.h"
/**
* @file
Modified: branches/SAMBA_4_0/source/lib/ldb/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/includes.h 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/lib/ldb/include/includes.h 2006-05-13 19:14:12 UTC (rev 15573)
@@ -7,7 +7,7 @@
#ifdef _SAMBA_BUILD_
#include "system/filesys.h"
-#include "system/iconv.h"
+#include "system/locale.h"
#include "system/time.h"
/* tell ldb we have the internal ldap code */
Modified: branches/SAMBA_4_0/source/lib/replace/replace.c
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/lib/replace/replace.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -23,7 +23,6 @@
#include "system/time.h"
#include "system/network.h"
#include "system/filesys.h"
-#include "system/iconv.h"
void replace_dummy(void);
void replace_dummy(void) {}
Modified: branches/SAMBA_4_0/source/lib/samba3/group.c
===================================================================
--- branches/SAMBA_4_0/source/lib/samba3/group.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/lib/samba3/group.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -20,7 +20,6 @@
*/
#include "includes.h"
-#include "system/iconv.h"
#include "lib/samba3/samba3.h"
#include "lib/tdb/include/tdbutil.h"
#include "system/filesys.h"
Modified: branches/SAMBA_4_0/source/lib/samba3/smbpasswd.c
===================================================================
--- branches/SAMBA_4_0/source/lib/samba3/smbpasswd.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/lib/samba3/smbpasswd.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -54,8 +54,8 @@
*/
#include "includes.h"
+#include "system/locale.h"
#include "lib/samba3/samba3.h"
-#include "system/iconv.h"
/*! Convert 32 hex characters into a 16 byte array. */
Modified: branches/SAMBA_4_0/source/lib/samba3/tdbsam.c
===================================================================
--- branches/SAMBA_4_0/source/lib/samba3/tdbsam.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/lib/samba3/tdbsam.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -21,7 +21,6 @@
*/
#include "includes.h"
-#include "system/iconv.h"
#include "system/filesys.h"
#include "lib/tdb/include/tdbutil.h"
#include "lib/samba3/samba3.h"
Modified: branches/SAMBA_4_0/source/lib/socket/access.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/access.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/lib/socket/access.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -33,8 +33,8 @@
#include "includes.h"
#include "system/network.h"
-#include "system/iconv.h"
#include "lib/socket/socket.h"
+#include "system/locale.h"
#define FAIL (-1)
#define ALLONES ((uint32_t)0xFFFFFFFF)
Modified: branches/SAMBA_4_0/source/lib/tdb/tools/tdbdump.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/tools/tdbdump.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/lib/tdb/tools/tdbdump.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -38,7 +38,7 @@
#include "includes.h"
#include "lib/tdb/include/tdb.h"
-#include "system/iconv.h"
+#include "system/locale.h"
#include "system/filesys.h"
#endif
Modified: branches/SAMBA_4_0/source/lib/util/genrand.c
===================================================================
--- branches/SAMBA_4_0/source/lib/util/genrand.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/lib/util/genrand.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -21,9 +21,9 @@
*/
#include "includes.h"
-#include "system/iconv.h"
#include "system/filesys.h"
#include "lib/crypto/crypto.h"
+#include "system/locale.h"
/**
* @file
Modified: branches/SAMBA_4_0/source/lib/util/util.c
===================================================================
--- branches/SAMBA_4_0/source/lib/util/util.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/lib/util/util.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -24,8 +24,8 @@
#include "includes.h"
#include "system/network.h"
-#include "system/iconv.h"
#include "system/filesys.h"
+#include "system/locale.h"
/**
* @file
Modified: branches/SAMBA_4_0/source/lib/util/util_str.c
===================================================================
--- branches/SAMBA_4_0/source/lib/util/util_str.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/lib/util/util_str.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -26,7 +26,7 @@
#include "smb.h"
#include "pstring.h"
#include "lib/ldb/include/ldb.h"
-#include "system/iconv.h"
+#include "system/locale.h"
/**
* @file
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -24,7 +24,6 @@
*/
#include "includes.h"
-#include "system/iconv.h"
#include "libcli/util/asn_1.h"
#include "libcli/ldap/ldap.h"
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -21,7 +21,6 @@
*/
#include "includes.h"
-#include "system/iconv.h"
#include "libcli/util/asn_1.h"
#include "libcli/ldap/ldap.h"
#include "lib/ldb/include/ldb.h"
Modified: branches/SAMBA_4_0/source/libcli/nbt/nbtname.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/nbt/nbtname.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/libcli/nbt/nbtname.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -25,9 +25,9 @@
*/
#include "includes.h"
-#include "system/iconv.h"
#include "librpc/gen_ndr/ndr_nbt.h"
#include "librpc/gen_ndr/ndr_misc.h"
+#include "system/locale.h"
/* don't allow an unlimited number of name components */
#define MAX_COMPONENTS 10
Modified: branches/SAMBA_4_0/source/libcli/security/sddl.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/security/sddl.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/libcli/security/sddl.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -21,9 +21,9 @@
*/
#include "includes.h"
-#include "system/iconv.h"
#include "libcli/security/security.h"
#include "librpc/gen_ndr/ndr_misc.h"
+#include "system/locale.h"
struct flag_map {
const char *name;
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_shortname.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_shortname.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_shortname.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -21,8 +21,8 @@
*/
#include "includes.h"
+#include "system/locale.h"
#include "vfs_posix.h"
-#include "system/iconv.h"
/*
this mangling scheme uses the following format
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/param/loadparm.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -58,7 +58,7 @@
#include "dynconfig.h"
#include "pstring.h"
#include "system/time.h"
-#include "system/iconv.h"
+#include "system/locale.h"
#include "librpc/gen_ndr/svcctl.h"
#include "librpc/gen_ndr/samr.h"
#include "smb_server/smb_server.h"
Modified: branches/SAMBA_4_0/source/param/params.c
===================================================================
--- branches/SAMBA_4_0/source/param/params.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/param/params.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -80,7 +80,7 @@
*/
#include "includes.h"
-#include "system/iconv.h"
+#include "system/locale.h"
/* -------------------------------------------------------------------------- **
* Constants...
Modified: branches/SAMBA_4_0/source/param/util.c
===================================================================
--- branches/SAMBA_4_0/source/param/util.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/param/util.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -25,7 +25,6 @@
#include "includes.h"
#include "dynconfig.h"
#include "system/network.h"
-#include "system/iconv.h"
#include "system/filesys.h"
/**
Modified: branches/SAMBA_4_0/source/torture/basic/utable.c
===================================================================
--- branches/SAMBA_4_0/source/torture/basic/utable.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/torture/basic/utable.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -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"
Modified: branches/SAMBA_4_0/source/torture/local/config.mk
===================================================================
--- branches/SAMBA_4_0/source/torture/local/config.mk 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/torture/local/config.mk 2006-05-13 19:14:12 UTC (rev 15573)
@@ -21,6 +21,7 @@
RPC_NDR_ECHO \
LIBCLI_SMB \
MESSAGING \
+ ICONV \
registry
# End SUBSYSTEM TORTURE_LOCAL
#################################
Modified: branches/SAMBA_4_0/source/utils/ndrdump.c
===================================================================
--- branches/SAMBA_4_0/source/utils/ndrdump.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/utils/ndrdump.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -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"
Modified: branches/SAMBA_4_0/source/utils/nmblookup.c
===================================================================
--- branches/SAMBA_4_0/source/utils/nmblookup.c 2006-05-13 18:12:53 UTC (rev 15572)
+++ branches/SAMBA_4_0/source/utils/nmblookup.c 2006-05-13 19:14:12 UTC (rev 15573)
@@ -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"
More information about the samba-cvs
mailing list