summaryrefslogtreecommitdiff
path: root/source3/include/includes.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-07-04 07:15:53 +0000
committerAndrew Tridgell <tridge@samba.org>2001-07-04 07:15:53 +0000
commit87fbb7092b8f8b2f0db0f361c3d625e19de57cd9 (patch)
tree3c302f710cbaa03e3c0d46549e8982771b12b8a5 /source3/include/includes.h
parent9e9e73303ec10a64bd744b9b33f4e6cd7d394f03 (diff)
downloadsamba-87fbb7092b8f8b2f0db0f361c3d625e19de57cd9.tar.gz
samba-87fbb7092b8f8b2f0db0f361c3d625e19de57cd9.tar.bz2
samba-87fbb7092b8f8b2f0db0f361c3d625e19de57cd9.zip
The big character set handling changeover!
This commit gets rid of all our old codepage handling and replaces it with iconv. All internal strings in Samba are now in "unix" charset, which may be multi-byte. See internals.doc and my posting to samba-technical for a more complete explanation. (This used to be commit debb471267960e56005a741817ebd227ecfc512a)
Diffstat (limited to 'source3/include/includes.h')
-rw-r--r--source3/include/includes.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index c5f4720a5a..9ed7401df3 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -361,6 +361,10 @@
#include <sys/shm.h>
#endif /* HAVE_SYS_SHM_H */
+#ifdef HAVE_NATIVE_ICONV
+#include <iconv.h>
+#endif
+
/*
* Define VOLATILE if needed.
*/
@@ -656,9 +660,6 @@ extern int errno;
#include "byteorder.h"
-#include "kanji.h"
-#include "charset.h"
-
#include "ntdomain.h"
#include "msdfs.h"
@@ -1016,6 +1017,7 @@ extern int DEBUGLEVEL;
#define F_SETLKW 14
#endif
+
/* Needed for sys_dlopen/sys_dlsym/sys_dlclose */
#ifndef RTLD_GLOBAL
#define RTLD_GLOBAL 0