--- np2/win9x/oemtext.h	2006/12/23 12:49:22	1.6
+++ np2/win9x/oemtext.h	2006/12/24 00:52:29	1.8
@@ -1,18 +1,17 @@
 
 #include	"codecnv.h"
-#include	<snanls.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-UINT oemtext_mbtoucs2(UINT cp, WCHAR *dst, UINT dcnt, const char *src, UINT scnt);
-UINT oemtext_ucs2tomb(UINT cp, char *dst, UINT dcnt, const WCHAR *src, UINT scnt);
+UINT oemtext_mbtoucs2(UINT cp, wchar_t *dst, UINT dcnt, const char *src, UINT scnt);
+UINT oemtext_ucs2tomb(UINT cp, char *dst, UINT dcnt, const wchar_t *src, UINT scnt);
 UINT oemtext_mbtoutf8(UINT cp, char *dst, UINT dcnt, const char *src, UINT scnt);
 UINT oemtext_utf8tomb(UINT cp, char *dst, UINT dcnt, const char *src, UINT scnt);
 
-UINT oemtext_chartoucs2(WCHAR *dst, UINT dcnt, const char *src, UINT scnt);
-UINT oemtext_ucs2tochar(char *dst, UINT dcnt, const WCHAR *src, UINT scnt);
+UINT oemtext_chartoucs2(wchar_t *dst, UINT dcnt, const char *src, UINT scnt);
+UINT oemtext_ucs2tochar(char *dst, UINT dcnt, const wchar_t *src, UINT scnt);
 UINT oemtext_chartoutf8(char *dst, UINT dcnt, const char *src, UINT scnt);
 UINT oemtext_utf8tochar(char *dst, UINT dcnt, const char *src, UINT scnt);
 
@@ -21,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