From f18c9365caaad75c0f4c9e26b89327a75cfcb3e6 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 21 Sep 2006 17:00:07 +0000 Subject: r18787: Fix the strlen_m and strlen_m_term code by merging in (and using elsewhere) next_codepoint from Samba4. Jerry please test. Jeremy. (This used to be commit ece00b70a4621633f1ac9e576c4bbe332031de09) --- source3/include/charset.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/include/charset.h') diff --git a/source3/include/charset.h b/source3/include/charset.h index a4dfef3a50..8a51a1876e 100644 --- a/source3/include/charset.h +++ b/source3/include/charset.h @@ -22,6 +22,7 @@ /* 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; +#if 0 /* FIXME!!! Hack job for now to get the lsa ndr code compiling */ #ifndef strlen_m #define strlen_m strlen @@ -29,7 +30,7 @@ typedef enum {CH_UCS2=0, CH_UTF16=0, CH_UNIX=1, CH_DISPLAY=2, CH_DOS=3, CH_UTF8= #ifndef strlen_m_term #define strlen_m_term strlen #endif - +#endif #define NUM_CHARSETS 5 -- cgit