--- np2/x11/toolwin.h	2003/11/16 16:43:45	1.1
+++ 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,13 +25,10 @@ typedef struct {
 	char	skinmru[SKINMRU_MAX][MAX_PATH];
 } NP2TOOL;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern NP2TOOL np2tool;
 
-#if 1
+#if !defined(SUPPORT_TOOLWINDOW)
+
 #define	toolwin_create()
 #define	toolwin_destroy()
 #define	toolwin_setfdd(drv, name)
@@ -38,7 +37,9 @@ extern NP2TOOL np2tool;
 #define	toolwin_draw(frame)		(void)frame
 #define	toolwin_readini()
 #define	toolwin_writeini()
-#else
+
+#else	/* !SUPPORT_TOOLWIN */
+
 void toolwin_create(void);
 void toolwin_destroy(void);
 
@@ -51,10 +52,9 @@ void toolwin_draw(BYTE frame);
 
 void toolwin_readini(void);
 void toolwin_writeini(void);
-#endif
 
-#ifdef __cplusplus
-}
-#endif
+#endif	/* SUPPORT_TOOLWIN */
+
+G_END_DECLS
 
 #endif	/* NP2_X11_TOOLWIN_H__ */