From 5d999862113fbc655429a0dd9bd7583ba3848434 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 11 Jan 2011 14:26:29 +0100
Subject: scanner: Rename g_irepository_dump when included from the dumper

This avoids a naming conflict when compiling GiRepository.gir, where
g_irepository_dump() was defined in an included header.
---
 girepository/gdump.c | 6 ++++--
 giscanner/dumper.py  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/girepository/gdump.c b/girepository/gdump.c
index cdede612..1b9ffd4f 100644
--- a/girepository/gdump.c
+++ b/girepository/gdump.c
@@ -381,10 +381,12 @@ dump_type (GType type, const char *symbol, GOutputStream *out)
  * Returns: %TRUE on success, %FALSE on error
  */
 #ifndef G_IREPOSITORY_COMPILATION
-static
-#endif
+static gboolean
+dump_irepository (const char *arg, GError **error)
+#else
 gboolean
 g_irepository_dump (const char *arg, GError **error)
+#endif
 {
   GHashTable *output_types;
   char **args;
diff --git a/giscanner/dumper.py b/giscanner/dumper.py
index 36a88076..fcc00026 100644
--- a/giscanner/dumper.py
+++ b/giscanner/dumper.py
@@ -58,7 +58,7 @@ main(int argc, char **argv)
       exit (1);
     }
 
-  if (!g_irepository_dump (argv[1] + strlen(introspect_dump_prefix), &error))
+  if (!dump_irepository (argv[1] + strlen(introspect_dump_prefix), &error))
     {
       g_printerr ("%%s\\n", error->message);
       exit (1);
-- 
cgit v1.2.1