--- np2/win9x/oemtext.h 2005/02/09 20:11:35 1.1 +++ np2/win9x/oemtext.h 2005/03/20 06:09:16 1.3 @@ -3,14 +3,9 @@ extern "C" { #endif -#if defined(OSLANG_UTF8) -UINT oemtext_sjis2oem(OEMCHAR *dst, UINT dcnt, const char *src, UINT scnt); -UINT oemtext_oem2sjis(char *dst, UINT dcnt, const OEMCHAR *src, UINT scnt); -#elif defined(OSLANG_UCS2) -#define oemtext_sjis2oem(dst, dcnt, src, scnt) \ - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, src, -1, dst, dcnt) -#define oemtext_oem2sjis(dst, dcnt, src, scnt) \ - WideCharToMultiByte(CP_ACP, 0, src, -1, dst, dcnt, NULL, NULL) +#if defined(OSLANG_UTF8) || defined(OSLANG_UCS2) +UINT oemtext_sjistooem(OEMCHAR *dst, UINT dcnt, const char *src, UINT scnt); +UINT oemtext_oemtosjis(char *dst, UINT dcnt, const OEMCHAR *src, UINT scnt); #endif #ifdef __cplusplus