--- np2/x11/toolwin.h	2004/07/28 13:57:29	1.2
+++ np2/x11/toolwin.h	2011/01/15 19:16:58	1.3
@@ -1,6 +1,8 @@
 #ifndef	NP2_X11_TOOLWIN_H__
 #define	NP2_X11_TOOLWIN_H__
 
+G_BEGIN_DECLS
+
 enum {
 	SKINMRU_MAX	= 4,
 	FDDLIST_DRV	= 2,
@@ -23,10 +25,6 @@ typedef struct {
 	char	skinmru[SKINMRU_MAX][MAX_PATH];
 } NP2TOOL;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern NP2TOOL np2tool;
 
 #if !defined(SUPPORT_TOOLWINDOW)
@@ -57,8 +55,6 @@ void toolwin_writeini(void);
 
 #endif	/* SUPPORT_TOOLWIN */
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif	/* NP2_X11_TOOLWIN_H__ */