--- np2/wince/w32/compiler.h 2005/02/09 20:11:37 1.22 +++ np2/wince/w32/compiler.h 2005/03/24 04:40:33 1.24 @@ -10,9 +10,9 @@ #endif #define OSLINEBREAK_CRLF -typedef signed int SINT; -typedef signed char SINT8; -typedef unsigned char UINT8; +typedef signed int SINT; +typedef signed char SINT8; +typedef unsigned char UINT8; typedef signed short SINT16; typedef unsigned short UINT16; typedef signed int SINT32; @@ -33,7 +33,7 @@ typedef unsigned int UINT32; // for RISC test #define REG8 UINT -#define REG16 UINT +#define REG16 UINT #define LOW12(a) (((UINT32)((a) << 20)) >> 20) #define LOW14(a) (((UINT32)((a) << 18)) >> 18) #define LOW15(a) (((UINT32)((a) << 17)) >> 17) @@ -49,15 +49,13 @@ typedef unsigned int UINT32; #define OEMSTRLEN lstrlen #else #define OEMCHAR char -#define OEMTEXT(string) (string) +#define OEMTEXT(string) string #define OEMSPRINTF sprintf #define OEMSTRLEN strlen #endif #include "common.h" -#include "oemtext.h" #include "milstr.h" -#include "ucscnv.h" #include "_memory.h" #include "rect.h" #include "lstarray.h" @@ -75,11 +73,14 @@ typedef unsigned int UINT32; #endif #define VERMOUTH_LIB -#define SOUND_CRITICAL +#define SOUND_CRITICAL +#if defined(OSLANG_SJIS) #define SUPPORT_SJIS -#if defined(OSLANG_UTF8) +#elif defined(OSLANG_UTF8) #define SUPPORT_UTF8 +#else +#define SUPPORT_ANK #endif #define SUPPORT_16BPP