From 66f164c0ea4013e1970f3bafb1960beed0d2d860 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 11 Jan 2011 14:26:29 +0100 Subject: [PATCH] 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. --- gdump.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gdump.c b/gdump.c index cdede612b..1b9ffd4f8 100644 --- a/gdump.c +++ b/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;