summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-06-16 02:22:52 +0000
committerAndrew Tridgell <tridge@samba.org>2003-06-16 02:22:52 +0000
commit8cd67d76683a41a1db5efc3a9c65e056ec2263f4 (patch)
treec20fdee14ba1971aa21b2c1f898caaacf6df7acf /source3/include
parent145b01a496fcc35cc86cacb1ac79ed754257a7c3 (diff)
downloadsamba-8cd67d76683a41a1db5efc3a9c65e056ec2263f4.tar.gz
samba-8cd67d76683a41a1db5efc3a9c65e056ec2263f4.tar.bz2
samba-8cd67d76683a41a1db5efc3a9c65e056ec2263f4.zip
reverted locale patch put in by jht (originally from vorlon).
There are lots of things wrong with this patch, including: 1) it overrides a user chosen configuration option 2) it adds lots of complexity inside a loop when a tiny piece of code outside the loop would do the same thing 3) it does no error checking, and is sure to crash on some systems If you want this functionality then try something like this at the end of charset_name(): #ifdef HAVE_NL_LANGINFO if (strcasecmp(ret, "LOCALE") == 0) { const char *ln = nl_langinfo(CODESET); if (ln) { DEBUG(5,("Substituting charset '%s' for LOCALE\n", ln)); return ln; } } #endif then users can set 'display charset = LOCALE' to get the locale based charset. You could even make that the default for systems that have nl_langinfo(). (This used to be commit 382b9b806b1ecd227b1ea247e3825d6848090462)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index edaeda3abe..3dbe6d1093 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -441,14 +441,6 @@
#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