From f824cf85a4fc5ba06edea2967ffb51056bd83fb7 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Tue, 14 Jun 2016 15:13:58 +0100
Subject: [PATCH] Fix Untar namespacing.

---
 simgear/io/untar.cxx | 11 +++--------
 simgear/io/untar.hxx | 11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/simgear/io/untar.cxx b/simgear/io/untar.cxx
index 14ba27ce..c2e55b92 100644
--- a/simgear/io/untar.cxx
+++ b/simgear/io/untar.cxx
@@ -34,12 +34,9 @@
 namespace simgear
 {
 
-namespace pkg
-{
-
-    const int ZLIB_DECOMPRESS_BUFFER_SIZE = 32 * 1024;
-    const int ZLIB_INFLATE_WINDOW_BITS = MAX_WBITS;
-    const int ZLIB_DECODE_GZIP_HEADER = 16;
+const int ZLIB_DECOMPRESS_BUFFER_SIZE = 32 * 1024;
+const int ZLIB_INFLATE_WINDOW_BITS = MAX_WBITS;
+const int ZLIB_DECODE_GZIP_HEADER = 16;
 
 /* tar Header Block, from POSIX 1003.1-1990.  */
 
@@ -344,6 +341,4 @@ bool TarExtractor::hasError() const
     return (d->state >= TarExtractorPrivate::ERROR_STATE);
 }
 
-} // of pkg
-
 } // of simgear
diff --git a/simgear/io/untar.hxx b/simgear/io/untar.hxx
index 0b653a67..b14da6ff 100644
--- a/simgear/io/untar.hxx
+++ b/simgear/io/untar.hxx
@@ -15,8 +15,8 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
-#ifndef SG_PKG_UNTAR_HXX
-#define SG_PKG_UNTAR_HXX
+#ifndef SG_IO_UNTAR_HXX
+#define SG_IO_UNTAR_HXX
 
 #include <memory>
 
@@ -25,9 +25,6 @@
 namespace simgear
 {
 
-namespace pkg
-{
-
 class TarExtractorPrivate;
 
 class TarExtractor
@@ -46,8 +43,6 @@ private:
     std::auto_ptr<TarExtractorPrivate> d;
 };
 
-} // of namespace pkg
-
 } // of namespace simgear
 
-#endif
+#endif // of SG_IO_UNTAR_HXX