[gdk-pixbuf/gdk-pixbuf-2-24] Work around gtk-doc limitations



commit bde1d6855e33963a2fa2ddf21186ebd8f3d12d98
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Dec 16 15:06:07 2011 -0500

    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

 gdk-pixbuf/gdk-pixbuf-animation.h |    2 ++
 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 e32a242..9d1fbfb 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 b2fdc33..49bf4e3 100644
--- a/gdk-pixbuf/gdk-pixbuf-core.h
+++ b/gdk-pixbuf/gdk-pixbuf-core.h
@@ -270,12 +270,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);
@@ -310,11 +312,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, 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]