--- np2/x11/oemtext.h	2005/02/26 14:13:01	1.2
+++ np2/x11/oemtext.h	2011/01/15 19:16:58	1.4
@@ -1,19 +1,15 @@
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "codecnv.h"
 
 #if 1
 #define	oemtext_sjistooem	codecnv_sjistoeuc
 #define	oemtext_oemtosjis	codecnv_euctosjis
 #else
+
+G_BEGIN_DECLS
+
 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
-}
-#endif
+G_END_DECLS
 
+#endif