--- np2/x11/joymng.h	2007/01/23 15:48:20	1.3
+++ np2/x11/joymng.h	2011/01/15 19:16:58	1.5
@@ -1,5 +1,3 @@
-/*	$Id: joymng.h,v 1.3 2007/01/23 15:48:20 monaka Exp $	*/
-
 /*-
  * Copyright (c) 2004 NONAKA Kimihiro <aw9k-nnk@asahi-net.or.jp>,
  * All rights reserved.
@@ -33,9 +31,7 @@
  * joystick manager
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 #define	JOY_NAXIS		2
 #define	JOY_NBUTTON		4
@@ -88,8 +84,6 @@ void joymng_sync(void);
 
 #endif	/* SUPPORT_JOYSTICK */
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif	/* NP2_X11_JOYMNG_H__ */