diff options
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" |