--- np2/win9x/oemtext.h 2006/12/23 23:34:32 1.7 +++ np2/win9x/oemtext.h 2006/12/24 00:52:29 1.8 @@ -1,8 +1,4 @@ -#ifndef __GNUC__ -#include -#endif - #include "codecnv.h" #ifdef __cplusplus @@ -24,11 +20,11 @@ UINT oemtext_utf8tochar(char *dst, UINT #endif #if defined(OSLANG_UTF8) -#define oemtext_sjistooem(a, b, c, d) oemtext_mbtoutf8(CP_932, a, b, c, d) -#define oemtext_oemtosjis(a, b, c, d) oemtext_utf8tomb(CP_932, a, b, c, d) +#define oemtext_sjistooem(a, b, c, d) oemtext_mbtoutf8(932, a, b, c, d) +#define oemtext_oemtosjis(a, b, c, d) oemtext_utf8tomb(932, a, b, c, d) #elif defined(OSLANG_UCS2) -#define oemtext_sjistooem(a, b, c, d) oemtext_mbtoucs2(CP_932, a, b, c, d) -#define oemtext_oemtosjis(a, b, c, d) oemtext_ucs2tomb(CP_932, a, b, c, d) +#define oemtext_sjistooem(a, b, c, d) oemtext_mbtoucs2(932, a, b, c, d) +#define oemtext_oemtosjis(a, b, c, d) oemtext_ucs2tomb(932, a, b, c, d) #endif