svn commit: samba r4124 - in branches/SAMBA_4_0/source: build/m4 include/system lib

[tridge at samba.org]

Author: tridge
Date: 2004-12-10 04:41:56 +0000 (Fri, 10 Dec 2004)
New Revision: 4124

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4124

Log:
include locale.h to get LC_ALL in include/system/iconv.h

Modified:
   branches/SAMBA_4_0/source/build/m4/rewrite.m4
   branches/SAMBA_4_0/source/include/system/iconv.h
   branches/SAMBA_4_0/source/lib/charcnv.c


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/rewrite.m4	2004-12-10 03:41:54 UTC (rev 4123)
+++ branches/SAMBA_4_0/source/build/m4/rewrite.m4	2004-12-10 04:41:56 UTC (rev 4124)
@@ -241,7 +241,7 @@
 AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
 AC_CHECK_HEADERS(security/pam_modules.h security/_pam_macros.h dlfcn.h)
 AC_CHECK_HEADERS(sys/syslog.h syslog.h)
-AC_CHECK_HEADERS(stdint.h)
+AC_CHECK_HEADERS(stdint.h locale.h)
 
 #
 # HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.

Modified: branches/SAMBA_4_0/source/include/system/iconv.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/iconv.h	2004-12-10 03:41:54 UTC (rev 4123)
+++ branches/SAMBA_4_0/source/include/system/iconv.h	2004-12-10 04:41:56 UTC (rev 4124)
@@ -33,6 +33,10 @@
 #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

Modified: branches/SAMBA_4_0/source/lib/charcnv.c
===================================================================
--- branches/SAMBA_4_0/source/lib/charcnv.c	2004-12-10 03:41:54 UTC (rev 4123)
+++ branches/SAMBA_4_0/source/lib/charcnv.c	2004-12-10 04:41:56 UTC (rev 4124)
@@ -89,7 +89,7 @@
 	if (initialised == 0) {
 		initialised = 1;
 		
-#ifdef HAVE_SETLOCALE
+#ifdef LC_ALL
 		/* we set back the locale to C to get ASCII-compatible
 		   toupper/lower functions.  For now we do not need
 		   any other POSIX localisations anyway. When we