--- np2/x11/soundmng.h	2008/04/02 13:04:00	1.5
+++ np2/x11/soundmng.h	2011/01/15 19:16:58	1.7
@@ -1,11 +1,7 @@
-/*	$Id: soundmng.h,v 1.5 2008/04/02 13:04:00 monaka Exp $	*/
-
 #ifndef	NP2_X11_SOUNGMNG_H__
 #define	NP2_X11_SOUNGMNG_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 enum {
 	SOUND_PCMSEEK,
@@ -44,7 +40,7 @@ void soundmng_pcmvolume(UINT num, int vo
 
 #else	/* NOSOUND */
 
-#define soundmng_create(rate, ms)	0, (void)rate, (void)ms
+#define soundmng_create(rate, ms)	0
 #define	soundmng_destroy()
 #define	soundmng_reset()
 #define	soundmng_play()
@@ -65,8 +61,6 @@ void soundmng_pcmvolume(UINT num, int vo
 
 #endif	/* !NOSOUND */
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif	/* NP2_X11_SOUNGMNG_H__ */