diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-12-16 15:06:07 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-12-16 16:44:04 -0500 |
| commit | 4396ba3c282a3275cba2bdbd73b2ef32412dca47 (patch) | |
| tree | 4c9e75bf5185b1c099c42af36550406763fc6fa8 /gdk-pixbuf | |
| parent | f592afe9560174eaa2eeaca787c8eed861cfe3e5 (diff) | |
| download | gdk-pixbuf-4396ba3c282a3275cba2bdbd73b2ef32412dca47.tar.gz | |
Work around gtk-doc limitations
gtk-doc gets confused by the win32 compat _utf8 defines.
So, hide those from it.
Bug https://bugzilla.gnome.org/show_bug.cgi?id=663554
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-animation.h | 2 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-core.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-animation.h b/gdk-pixbuf/gdk-pixbuf-animation.h index 65b34d9cb..8213e9425 100644 --- a/gdk-pixbuf/gdk-pixbuf-animation.h +++ b/gdk-pixbuf/gdk-pixbuf-animation.h @@ -64,9 +64,11 @@ typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter; GType gdk_pixbuf_animation_get_type (void) G_GNUC_CONST; +#ifndef __GTK_DOC_IGNORE__ #ifdef G_OS_WIN32 #define gdk_pixbuf_animation_new_from_file gdk_pixbuf_animation_new_from_file_utf8 #endif +#endif GdkPixbufAnimation *gdk_pixbuf_animation_new_from_file (const char *filename, GError **error); diff --git a/gdk-pixbuf/gdk-pixbuf-core.h b/gdk-pixbuf/gdk-pixbuf-core.h index 016310247..d54243743 100644 --- a/gdk-pixbuf/gdk-pixbuf-core.h +++ b/gdk-pixbuf/gdk-pixbuf-core.h @@ -272,12 +272,14 @@ GdkPixbuf *gdk_pixbuf_new_subpixbuf (GdkPixbuf *src_pixbuf, /* Simple loading */ +#ifndef __GTK_DOC_IGNORE__ #ifdef G_OS_WIN32 /* DLL ABI stability hack. */ #define gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file_utf8 #define gdk_pixbuf_new_from_file_at_size gdk_pixbuf_new_from_file_at_size_utf8 #define gdk_pixbuf_new_from_file_at_scale gdk_pixbuf_new_from_file_at_scale_utf8 #endif +#endif GdkPixbuf *gdk_pixbuf_new_from_file (const char *filename, GError **error); @@ -312,11 +314,13 @@ void gdk_pixbuf_fill (GdkPixbuf *pixbuf, /* Saving */ +#ifndef __GTK_DOC_IGNORE__ #ifdef G_OS_WIN32 /* DLL ABI stability hack. */ #define gdk_pixbuf_save gdk_pixbuf_save_utf8 #define gdk_pixbuf_savev gdk_pixbuf_savev_utf8 #endif +#endif gboolean gdk_pixbuf_save (GdkPixbuf *pixbuf, const char *filename, |