From cfb7367faf3415ab618f917ad0dea8319a02b1d7 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sat, 5 Feb 2005 06:05:19 +0000 Subject: [PATCH] *** empty log message *** --- ase/macros.h | 12 ++++++------ ase/test/lsp/lisp.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ase/macros.h b/ase/macros.h index 4e3aded5..a4e92fc6 100644 --- a/ase/macros.h +++ b/ase/macros.h @@ -1,5 +1,5 @@ /* - * $Id: macros.h,v 1.7 2005-01-21 06:02:02 bacon Exp $ + * $Id: macros.h,v 1.8 2005-02-05 06:05:19 bacon Exp $ */ #ifndef _XP_MACROS_H_ @@ -38,12 +38,12 @@ #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) -#define XP_TEXT(txt) XP_MTEXT(txt) +#if defined(XP_CHAR_IS_MCHAR) + #define XP_CHAR(ch) XP_MCHAR(ch) + #define XP_TEXT(txt) XP_MTEXT(txt) #else -#define XP_CHAR(ch) XP_WCHAR(ch) -#define XP_TEXT(txt) XP_WTEXT(txt) + #define XP_CHAR(ch) XP_WCHAR(ch) + #define XP_TEXT(txt) XP_WTEXT(txt) #endif #endif diff --git a/ase/test/lsp/lisp.c b/ase/test/lsp/lisp.c index 8312ceaa..0d4905f3 100644 --- a/ase/test/lsp/lisp.c +++ b/ase/test/lsp/lisp.c @@ -10,9 +10,9 @@ static int get_char (xp_lisp_cint* ch, void* arg) { xp_lisp_cint c; - c = fgetc(stdin); + c = xp_fgetc(stdin); if (c == XP_EOF) { - if (ferror(stdin)) return -1; + if (xp_ferror(stdin)) return -1; c = XP_EOF; }