summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-09-21 18:37:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:00:58 -0500
commit3a60a6743262ab2ab221e0fe13ef6b510424ca3f (patch)
tree7029367395949ad4ce03813c2a7361e934a1cf4d /source3/include
parentc8ef27a3c3db3f04d592652fd6103c5b5cf83d03 (diff)
downloadsamba-3a60a6743262ab2ab221e0fe13ef6b510424ca3f.tar.gz
samba-3a60a6743262ab2ab221e0fe13ef6b510424ca3f.tar.bz2
samba-3a60a6743262ab2ab221e0fe13ef6b510424ca3f.zip
r18793: Fix BE string handling in the auto-generated
code. Should now work again with ASU. Jeremy. (This used to be commit 53e97bf92817b6cfc3f93c999a81ef8ad49a1609)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/charset.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/source3/include/charset.h b/source3/include/charset.h
index 8a51a1876e..5983fcdd4f 100644
--- a/source3/include/charset.h
+++ b/source3/include/charset.h
@@ -20,19 +20,9 @@
*/
/* this defines the charset types used in samba */
-typedef enum {CH_UCS2=0, CH_UTF16=0, CH_UNIX=1, CH_DISPLAY=2, CH_DOS=3, CH_UTF8=4} charset_t;
+typedef enum {CH_UTF16LE=0, CH_UTF16=0, CH_UNIX=1, CH_DISPLAY=2, CH_DOS=3, CH_UTF8=4, CH_UTF16BE=5} charset_t;
-#if 0
-/* FIXME!!! Hack job for now to get the lsa ndr code compiling */
-#ifndef strlen_m
-#define strlen_m strlen
-#endif
-#ifndef strlen_m_term
-#define strlen_m_term strlen
-#endif
-#endif
-
-#define NUM_CHARSETS 5
+#define NUM_CHARSETS 6
/*
* for each charset we have a function that pushes from that charset to a ucs2