gtk+ r20180 - trunk/contrib/gdk-pixbuf-xlib

[mitch svn gnome org]

Author: mitch
Date: Mon May 26 15:14:41 2008
New Revision: 20180
URL: http://svn.gnome.org/viewvc/gtk+?rev=20180&view=rev

Log:
2008-05-26  Michael Natterer  <mitch imendio com>

	* gdk-pixbuf-xlib.h
	* gdk-pixbuf-xlibrgb.h: use G_BEGIN/END_DECLS.



Modified:
   trunk/contrib/gdk-pixbuf-xlib/ChangeLog
   trunk/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
   trunk/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h

Modified: trunk/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
==============================================================================
--- trunk/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h	(original)
+++ trunk/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h	Mon May 26 15:14:41 2008
@@ -21,12 +21,11 @@
 #ifndef GDK_PIXBUF_XLIB_H
 #define GDK_PIXBUF_XLIB_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
+
+G_BEGIN_DECLS
+
 #include <X11/Xlib.h>
 
 
@@ -83,9 +82,6 @@
 					      int dest_x, int dest_y,
 					      int width, int height);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* GDK_PIXBUF_XLIB_H */

Modified: trunk/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
==============================================================================
--- trunk/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h	(original)
+++ trunk/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h	Mon May 26 15:14:41 2008
@@ -51,15 +51,13 @@
 #ifndef __XLIB_RGB_H__
 #define __XLIB_RGB_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <glib.h>
+
+G_BEGIN_DECLS
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-#include <glib.h>
-
 typedef struct _XlibRgbCmap XlibRgbCmap;
 
 struct _XlibRgbCmap {
@@ -185,9 +183,6 @@
 Screen *
 xlib_rgb_get_screen (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __XLIB_RGB_H__ */