--- np2/wince/w32/compiler.h 2004/02/21 20:48:53 1.13 +++ np2/wince/w32/compiler.h 2004/06/19 17:28:29 1.16 @@ -1,4 +1,5 @@ #include +#include #include #include @@ -6,7 +7,6 @@ #define OSLANG_SJIS #define OSLINEBREAK_CRLF - typedef signed char SINT8; typedef unsigned char UINT8; typedef signed short SINT16; @@ -20,16 +20,16 @@ typedef unsigned int UINT32; #if !defined(SIZE_VGATEST) #define RGB16 UINT32 #endif -#define SUPPORT_SOFTKBD +#define SUPPORT_SOFTKBD 1 #endif // for RISC test #define REG8 UINT #define REG16 UINT -#define LOW12(a) ((((UINT)(a)) << 20) >> 20) -#define LOW14(a) ((((UINT)(a)) << 18) >> 18) -#define LOW15(a) ((((UINT)(a)) << 17) >> 17) +#define LOW12(a) (((UINT32)((a) << 20)) >> 20) +#define LOW14(a) (((UINT32)((a) << 18)) >> 18) +#define LOW15(a) (((UINT32)((a) << 17)) >> 17) #define LOW16(a) ((UINT16)(a)) #define HIGH16(a) (((UINT32)(a)) >> 16) @@ -43,7 +43,11 @@ typedef unsigned int UINT32; #define GETTICK() GetTickCount() +#if defined(UNICODE) +#define SPRINTF sprintf +#else #define SPRINTF wsprintf +#endif #define __ASSERT(s) #define VERMOUTH_LIB