--- np2/x11/joymng.h	2011/01/15 18:43:13	1.4
+++ np2/x11/joymng.h	2011/12/17 19:55:48	1.6
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2004 NONAKA Kimihiro <aw9k-nnk@asahi-net.or.jp>,
+ * Copyright (c) 2004 NONAKA Kimihiro
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,9 +31,7 @@
  * joystick manager
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 #define	JOY_NAXIS		2
 #define	JOY_NBUTTON		4
@@ -86,8 +84,6 @@ void joymng_sync(void);
 
 #endif	/* SUPPORT_JOYSTICK */
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif	/* NP2_X11_JOYMNG_H__ */