diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-05-26 15:14:41 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-05-26 15:14:41 +0000 |
| commit | c9d073570e784c5ae883dcf4cc20cf2b5e243935 (patch) | |
| tree | d12cfee261d3b5173d1383762f93ac726d055fdc /contrib | |
| parent | a21f711c671d54f68e42c0dda2334c9a5f205104 (diff) | |
| download | gtk+-c9d073570e784c5ae883dcf4cc20cf2b5e243935.tar.gz | |
gdk-pixbuf-xlib.h use G_BEGIN/END_DECLS.
2008-05-26 Michael Natterer <mitch@imendio.com>
* gdk-pixbuf-xlib.h
* gdk-pixbuf-xlibrgb.h: use G_BEGIN/END_DECLS.
svn path=/trunk/; revision=20180
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gdk-pixbuf-xlib/ChangeLog | 5 | ||||
| -rw-r--r-- | contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h | 12 | ||||
| -rw-r--r-- | contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h | 13 |
3 files changed, 13 insertions, 17 deletions
diff --git a/contrib/gdk-pixbuf-xlib/ChangeLog b/contrib/gdk-pixbuf-xlib/ChangeLog index 669089cbd6..ee5b585d83 100644 --- a/contrib/gdk-pixbuf-xlib/ChangeLog +++ b/contrib/gdk-pixbuf-xlib/ChangeLog @@ -1,3 +1,8 @@ +2008-05-26 Michael Natterer <mitch@imendio.com> + + * gdk-pixbuf-xlib.h + * gdk-pixbuf-xlibrgb.h: use G_BEGIN/END_DECLS. + 2008-02-16 Matthias Clasen <mclasen@redhat.com> * === Released 2.13.0 === diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h index 04f573e7d4..4ffc56039f 100644 --- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h +++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h @@ -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 @@ GdkPixbuf *gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest, int dest_x, int dest_y, int width, int height); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* GDK_PIXBUF_XLIB_H */ diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h index c94e746ff2..9433aeaccf 100644 --- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h +++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h @@ -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 @@ xlib_rgb_get_display (void); Screen * xlib_rgb_get_screen (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __XLIB_RGB_H__ */ |