Use plib rad/degrees conversion constants.

[simgear.git] / simgear / misc / zfstream.hxx

diff --git a/simgear/misc/zfstream.hxx b/simgear/misc/zfstream.hxx
index b093499f1597f186cca70c153be248a98758736c..3c2ce34fbf4c02492d6295fde79b839694846b25 100644 (file)
--- a/simgear/misc/zfstream.hxx
+++ b/simgear/misc/zfstream.hxx
@@ -5,25 +5,30 @@
 //
 // Copyright (C) 1998  Bernie Bright - bbright@c031.aone.net.au
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
+// Library General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA  02111-1307, USA.
 //
 // $Id$
 
 #ifndef _zfstream_hxx
 #define _zfstream_hxx
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
 
 #ifdef HAVE_ZLIB
@@ -32,7 +37,13 @@
 #  include <simgear/zlib/zlib.h>
 #endif
 
-#ifdef FG_HAVE_STD_INCLUDES
+// At least Irix needs this
+#ifdef SG_HAVE_NATIVE_SGI_COMPILERS
+#include <char_traits.h>
+SG_USING_STD(char_traits);
+#endif
+
+#ifdef SG_HAVE_STD_INCLUDES
 
 #  include <streambuf>
 #  include <istream>
@@ -48,14 +59,14 @@
 #  define ios_badbit   ios_base::badbit
 #  define ios_failbit  ios_base::failbit
 
-FG_USING_STD(streambuf);
-FG_USING_STD(ios_base);
-FG_USING_STD(streampos);
-FG_USING_STD(streamoff);
+SG_USING_STD(streambuf);
+SG_USING_STD(ios_base);
+SG_USING_STD(streampos);
+SG_USING_STD(streamoff);
 
 #else
 
-#  ifdef FG_HAVE_STREAMBUF
+#  ifdef SG_HAVE_STREAMBUF
 #    include <streambuf.h>
 #    include <istream.h>
 #  else
@@ -70,7 +81,7 @@ FG_USING_STD(streamoff);
 
 #if defined(__GNUC__) && __GNUC_MINOR__ < 8
 #  define ios_binary   ios::bin
-#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
+#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 #  define ios_binary   0
 #else
 #  define ios_binary   ios::binary
@@ -83,7 +94,7 @@ FG_USING_STD(streamoff);
 
 #  include <simgear/fg_traits.hxx>
 
-#endif // FG_HAVE_STD_INCLUDES
+#endif // SG_HAVE_STD_INCLUDES
 
 //-----------------------------------------------------------------------------
 //
@@ -93,11 +104,11 @@ class gzfilebuf : public streambuf
 {
 public:
 
-#ifndef FG_HAVE_STD_INCLUDES
+#ifndef SG_HAVE_STD_INCLUDES
     typedef char_traits<char>           traits_type;
     typedef char_traits<char>::int_type int_type;
-    typedef char_traits<char>::pos_type pos_type;
-    typedef char_traits<char>::off_type off_type;
+    // typedef char_traits<char>::pos_type pos_type;
+    // typedef char_traits<char>::off_type off_type;
 #endif
 
     gzfilebuf();