[libgsf] gsf: compilation improvements.

[Morten Welinder <mortenw src gnome org>]

commit 46831f6364810538990a49c1e64f76deb9583bbd
Author: Morten Welinder <terra gnome org>
Date:   Sat Aug 28 20:29:56 2010 -0400

    gsf: compilation improvements.

 ChangeLog             |   14 ++++++++++++--
 gsf/gsf-impl-utils.h  |    2 +-
 gsf/gsf-output-bzip.c |    9 +++------
 3 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0f4868f..d42313a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,17 @@
+2010-08-28  Morten Welinder  <terra gnome org>
+
+	* gsf/gsf-impl-utils.h (GSF_CLASS_FULL): Don't use C89 argument
+	lists.
+
+	* gsf/gsf-output-bzip.c (gsf_output_bzip_close): Rework previous
+	change.  We do not want two prototypes.
+
 2009-08-15  Andreas J. Guelzow <aguelzow pyrshep ca>
 
-	* gsf/gsf-opendoc-utils.c (gsf_ooo_ns): add some more of OOo's namespaces
-	* gsf/gsf-opendoc-utils.h: add new enum values to support above name spaces)
+	* gsf/gsf-opendoc-utils.c (gsf_ooo_ns): add some more of OOo's
+	namespaces
+	* gsf/gsf-opendoc-utils.h: add new enum values to support above
+	name spaces)
 	* gsf/gsf-output-bzip.c (gsf_output_bzip_close): quieten compile
 
 2010-07-28  Morten Welinder  <terra gnome org>
diff --git a/gsf/gsf-impl-utils.h b/gsf/gsf-impl-utils.h
index b21e556..058286c 100644
--- a/gsf/gsf-impl-utils.h
+++ b/gsf/gsf-impl-utils.h
@@ -106,7 +106,7 @@ GType prefix ## _get_type (void);					\
 void  prefix ## _register_type (GTypeModule *module);			\
 									\
 GType									\
-prefix ## _get_type ()							\
+prefix ## _get_type (void)						\
 {									\
 	g_return_val_if_fail (prefix ## _type != 0, 0); 		\
 	return prefix ## _type;						\
diff --git a/gsf/gsf-output-bzip.c b/gsf/gsf-output-bzip.c
index d566160..3d2ff62 100644
--- a/gsf/gsf-output-bzip.c
+++ b/gsf/gsf-output-bzip.c
@@ -180,10 +180,10 @@ gsf_output_bzip_seek (G_GNUC_UNUSED GsfOutput *output,
 	return FALSE;
 }
 
-#ifdef HAVE_BZ2
 static gboolean
 gsf_output_bzip_close (GsfOutput *output)
 {
+#ifdef HAVE_BZ2
 	GsfOutputBzip *bzip = GSF_OUTPUT_BZIP (output);
 	gboolean rt;
 
@@ -191,14 +191,11 @@ gsf_output_bzip_close (GsfOutput *output)
 	BZ2_bzCompressEnd (&bzip->stream);
 
 	return rt;
-}
 #else
-static gboolean
-gsf_output_bzip_close (G_GNUC_UNUSED GsfOutput *output)
-{
+	(void)output;
 	return FALSE;
-}
 #endif
+}
 
 static void
 gsf_output_bzip_init (GObject *obj)