[libgsf] gsf_input_uncompress: avoid #ifdefs

[Morten Welinder <mortenw src gnome org>]

commit 2cec2698360826a4484b4a429d197f9f8060fc63
Author: Morten Welinder <terra gnome org>
Date:   Sat Feb 23 16:27:15 2013 -0500

    gsf_input_uncompress: avoid #ifdefs

 ChangeLog       |    3 +++
 gsf/gsf-input.c |    8 ++------
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 44b7f9e..b49f756 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-02-23  Morten Welinder  <terra gnome org>
 
+       * gsf/gsf-input.c (gsf_input_uncompress): Avoid HAVE_BZ2
+       conditionals.
+
        * gsf/gsf-utils.c (gsf_init_dynamic): Register the tar type too.
 
        * gsf/gsf-input.c (gsf_input_read): Detect overflow.
diff --git a/gsf/gsf-input.c b/gsf/gsf-input.c
index 03e4605..ee093cf 100644
--- a/gsf/gsf-input.c
+++ b/gsf/gsf-input.c
@@ -23,11 +23,9 @@
 #include <gsf/gsf-input-impl.h>
 #include <gsf/gsf-input-gzip.h>
 #include <gsf/gsf-impl-utils.h>
-#include <string.h>
-
-#ifdef HAVE_BZ2
 #include <gsf/gsf-input-bzip.h>
-#endif
+
+#include <string.h>
 
 #define GET_CLASS(instance) G_TYPE_INSTANCE_GET_CLASS (instance, GSF_INPUT_TYPE, GsfInputClass)
 
@@ -598,7 +596,6 @@ gsf_input_uncompress (GsfInput *src)
                }
        }
 
-#ifdef HAVE_BZ2
        /* Let's try bzip.  */
        {
                guint8 const *bzip_sig = "BZh";
@@ -611,7 +608,6 @@ gsf_input_uncompress (GsfInput *src)
                        }
                }
        }
-#endif
 
        /* Other methods go here.  */