summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2003-06-15 06:07:53 +0000
committerJohn Terpstra <jht@samba.org>2003-06-15 06:07:53 +0000
commit489956c82391d7559bb097b112957e6a7d91934c (patch)
treeac9dd17331cdf513de4fd98fcc165536b658963d /source3/include
parent5d4937c2b6e5b01fd13bc197224459ab690897e9 (diff)
downloadsamba-489956c82391d7559bb097b112957e6a7d91934c.tar.gz
samba-489956c82391d7559bb097b112957e6a7d91934c.tar.bz2
samba-489956c82391d7559bb097b112957e6a7d91934c.zip
Patch from vorlon@debian.org, see bugzilal #122
Samba should preferentially use the locale information from the native system, and only fall back on 'display charset' if this is unavailable or unsupported. (This used to be commit 1e445fb4220cdf4700dd9d1850a42746a1065c5a)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 3dbe6d1093..edaeda3abe 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -441,6 +441,14 @@
#include <attr/xattr.h>
#endif
+#if HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
+#if HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
/* Special macros that are no-ops except when run under Valgrind on
* x86. They've moved a little bit from valgrind 1.0.4 to 1.9.4 */
#if HAVE_VALGRIND_MEMCHECK_H