[gdk-pixbuf] lib: add gdk_pixbuf_win32_get_toplevel to the private API

[Bastien Nocera <hadess src gnome org>]

commit ae7716c83d103fb3d996be5befc715144f6941c0
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Wed Oct 22 19:26:07 2014 +0200

    lib: add gdk_pixbuf_win32_get_toplevel to the private API
    
    https://bugzilla.gnome.org/show_bug.cgi?id=737523

 gdk-pixbuf/gdk-pixbuf-io.c      |    6 +++---
 gdk-pixbuf/gdk-pixbuf-private.h |    4 ++++
 gdk-pixbuf/gdk-pixbuf-util.c    |    5 +----
 3 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index e197acf..efff246 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -210,7 +210,7 @@ DllMain (HINSTANCE hinstDLL,
 }
 
 char *
-_gdk_pixbuf_win32_get_toplevel (void)
+gdk_pixbuf_win32_get_toplevel (void)
 {
   static char *toplevel = NULL;
 
@@ -311,7 +311,7 @@ get_libdir (void)
   static char *libdir = NULL;
 
   if (libdir == NULL)
-          libdir = g_build_filename (_gdk_pixbuf_win32_get_toplevel (), "lib", NULL);
+          libdir = g_build_filename (gdk_pixbuf_win32_get_toplevel (), "lib", NULL);
 
   return libdir;
 }
@@ -340,7 +340,7 @@ correct_prefix (gchar **path)
        * installation prefix on this machine.
        */
       tem = *path;
-      *path = g_strconcat (_gdk_pixbuf_win32_get_toplevel (), tem + strlen (GDK_PIXBUF_PREFIX), NULL);
+      *path = g_strconcat (gdk_pixbuf_win32_get_toplevel (), tem + strlen (GDK_PIXBUF_PREFIX), NULL);
       g_free (tem);
     }
 }
diff --git a/gdk-pixbuf/gdk-pixbuf-private.h b/gdk-pixbuf/gdk-pixbuf-private.h
index e985459..edfa262 100644
--- a/gdk-pixbuf/gdk-pixbuf-private.h
+++ b/gdk-pixbuf/gdk-pixbuf-private.h
@@ -115,4 +115,8 @@ GdkPixbufLoader *_gdk_pixbuf_loader_new_with_filename (const char *filename);
 
 #endif /* GDK_PIXBUF_PRIVATE_H */
 
+#ifdef G_OS_WIN32
 
+gchar * gdk_pixbuf_win32_get_toplevel (void);
+
+#endif /* G_OS_WIN32 */
diff --git a/gdk-pixbuf/gdk-pixbuf-util.c b/gdk-pixbuf/gdk-pixbuf-util.c
index 63627e9..6a7a8f3 100644
--- a/gdk-pixbuf/gdk-pixbuf-util.c
+++ b/gdk-pixbuf/gdk-pixbuf-util.c
@@ -357,10 +357,7 @@ get_localedir (void)
     gchar *temp;
     gchar *retval;
     
-    /* In gdk-pixbuf-io.c */
-    extern char *_gdk_pixbuf_win32_get_toplevel (void);
-
-    temp = g_build_filename (_gdk_pixbuf_win32_get_toplevel (), "share/locale", NULL);
+    temp = g_build_filename (gdk_pixbuf_win32_get_toplevel (), "share/locale", NULL);
 
     /* The localedir is passed to bindtextdomain() which isn't
      * UTF-8-aware.