diff options
| author | Jeremy Allison <jra@samba.org> | 2006-09-21 17:00:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:00:57 -0500 |
| commit | f18c9365caaad75c0f4c9e26b89327a75cfcb3e6 (patch) | |
| tree | b5db870641dd49feb5d167b55350ecaeabd1f247 /source3/include | |
| parent | b3d18b12c23670b02f4f98e1afeb32f829050fb3 (diff) | |
| download | samba-f18c9365caaad75c0f4c9e26b89327a75cfcb3e6.tar.gz samba-f18c9365caaad75c0f4c9e26b89327a75cfcb3e6.tar.bz2 samba-f18c9365caaad75c0f4c9e26b89327a75cfcb3e6.zip | |
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)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/charset.h | 3 | ||||
| -rw-r--r-- | source3/include/smb.h | 4 |
2 files changed, 6 insertions, 1 deletions
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 diff --git a/source3/include/smb.h b/source3/include/smb.h index bba1621e8f..700dbcdf85 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -170,6 +170,10 @@ typedef smb_ucs2_t wfstring[FSTRING_LEN]; #define COPY_UCS2_CHAR(dest,src) (((unsigned char *)(dest))[0] = ((unsigned char *)(src))[0],\ ((unsigned char *)(dest))[1] = ((unsigned char *)(src))[1], (dest)) +/* Large data type for manipulating uint32 unicode codepoints */ +typedef uint32 codepoint_t; +#define INVALID_CODEPOINT ((codepoint_t)-1) + /* pipe string names */ #define PIPE_LANMAN "\\PIPE\\LANMAN" #define PIPE_SRVSVC "\\PIPE\\srvsvc" |