diff options
| -rw-r--r-- | lib/util/charset/charset.h | 9 | ||||
| -rw-r--r-- | source3/lib/util_unistr.c | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h index 494a4ebc1a..141fbea7be 100644 --- a/lib/util/charset/charset.h +++ b/lib/util/charset/charset.h @@ -48,15 +48,6 @@ typedef uint16_t smb_ucs2_t; /* turn a 7 bit character into a ucs2 character */ #define UCS2_CHAR(c) ((c) << UCS2_SHIFT) -/* return an ascii version of a ucs2 character */ -#define UCS2_TO_CHAR(c) (((c) >> UCS2_SHIFT) & 0xff) - -/* Copy into a smb_ucs2_t from a possibly unaligned buffer. Return the copied smb_ucs2_t */ -#define COPY_UCS2_CHAR(dest,src) (((unsigned char *)(dest))[0] = ((unsigned char *)(src))[0],\ - ((unsigned char *)(dest))[1] = ((unsigned char *)(src))[1], (dest)) - - - /* * for each charset we have a function that pulls from that charset to * a ucs2 buffer, and a function that pushes to a ucs2 buffer diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c index 14b5a8706b..7beb65c863 100644 --- a/source3/lib/util_unistr.c +++ b/source3/lib/util_unistr.c @@ -30,6 +30,15 @@ static uint8 *valid_table; static bool initialized; +/* Copy into a smb_ucs2_t from a possibly unaligned buffer. Return the copied smb_ucs2_t */ +#define COPY_UCS2_CHAR(dest,src) (((unsigned char *)(dest))[0] = ((unsigned char *)(src))[0],\ + ((unsigned char *)(dest))[1] = ((unsigned char *)(src))[1], (dest)) + + +/* return an ascii version of a ucs2 character */ +#define UCS2_TO_CHAR(c) (((c) >> UCS2_SHIFT) & 0xff) + + /** * Destroy global objects allocated by load_case_tables() **/ |