--- np2/x11/drawmng.h	2004/06/17 14:36:33	1.3
+++ np2/x11/drawmng.h	2011/01/15 19:16:58	1.6
@@ -10,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -32,6 +30,8 @@
 
 #include "cmndraw.h"
 
+G_BEGIN_DECLS
+
 typedef struct {
 	RGB32	mask;
 	BYTE	r16b;
@@ -53,10 +53,6 @@ typedef struct {
 	BOOL		drawing;
 } _DRAWMNG_HDL, *DRAWMNG_HDL;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 DRAWMNG_HDL drawmng_create(void *parent, int width, int height);
 void drawmng_release(DRAWMNG_HDL hdl);
 CMNVRAM *drawmng_surflock(DRAWMNG_HDL hdl);
@@ -69,8 +65,6 @@ void *drawmng_get_widget_handle(DRAWMNG_
 void drawmng_make16mask(PAL16MASK *pal16, UINT32 bmask, UINT32 rmask, UINT32 gmask);
 RGB16 drawmng_makepal16(PAL16MASK *pal16, RGB32 pal32);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif	/* NP2_X11_DRAWMNG_H__ */