--- np2/x11/soundmng.h	2011/01/15 18:43:13	1.6
+++ np2/x11/soundmng.h	2011/12/24 17:50:44	1.8
@@ -1,9 +1,7 @@
 #ifndef	NP2_X11_SOUNGMNG_H__
 #define	NP2_X11_SOUNGMNG_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 enum {
 	SOUND_PCMSEEK,
@@ -40,9 +38,11 @@ void soundmng_deinitialize(void);
 BOOL soundmng_pcmload(UINT num, const char *filename);
 void soundmng_pcmvolume(UINT num, int volume);
 
+extern int pcm_volume_default;
+
 #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()
@@ -63,8 +63,6 @@ void soundmng_pcmvolume(UINT num, int vo
 
 #endif	/* !NOSOUND */
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif	/* NP2_X11_SOUNGMNG_H__ */