From 648d40301ab484e23c34800125d933936f615ddb Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 21 Jan 2005 04:22:24 +0000 Subject: [PATCH] *** empty log message *** --- ase/macros.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ase/macros.h b/ase/macros.h index eabc2f0e..e335b8a6 100644 --- a/ase/macros.h +++ b/ase/macros.h @@ -1,5 +1,5 @@ /* - * $Id: macros.h,v 1.5 2005-01-21 04:17:50 bacon Exp $ + * $Id: macros.h,v 1.6 2005-01-21 04:22:24 bacon Exp $ */ #ifndef _XP_MACROS_H_ @@ -27,14 +27,16 @@ #define XP_QUOTE(val) __XP_QUOTE(val) #define __XP_QUOTE(val) #val -#define XP_MCHAR(ch) (ch) -#define XP_MTEXT(txt) (txt) +#define XP_MCHAR(ch) ((xp_mchar_t)ch) +#define XP_MTEXT(txt) ((const xp_mchar_t*)txt) /* TODO: if the compiler doesn't have the built-in wchar_t support * XP_WCHAR & XP_WTEXT must be defined differently. +#define XP_WCHAR(ch) ((xp_wchar_t)ch) +#define XP_WTEXT(txt) don't know yet... may have to call a function? */ -#define XP_WCHAR(ch) (L##ch) -#define XP_WTEXT(txt) (L##txt) +#define XP_WCHAR(ch) ((xp_wchar_t)L##ch) +#define XP_WTEXT(txt) ((const xp_wchar_t*)L##txt) #ifdef XP_CHAR_IS_MCHAR #define XP_CHAR(ch) XP_MCHAR(ch)