From 8aec98017a7fa8b958e8e8b28d0ca024e691cde7 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 19 Jan 1999 20:41:46 +0000
Subject: [PATCH] Portability updates contributed by Bernie Bright.

---
 Misc/fgstream.hxx | 23 +++++++++++++----------
 Misc/strutils.hxx | 15 +++++++++++----
 Misc/zfstream.cxx |  5 +++--
 Misc/zfstream.hxx | 10 +++++++++-
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/Misc/fgstream.hxx b/Misc/fgstream.hxx
index e202a78c2..a707acf90 100644
--- a/Misc/fgstream.hxx
+++ b/Misc/fgstream.hxx
@@ -35,20 +35,18 @@
 #include <string>
 
 #include "Include/compiler.h"
-FG_USING_STD(string);
+#ifdef FG_HAVE_STD_INCLUDES
+#  include <istream>
+#else
+#  include <istream.h>
+#endif
+
+FG_USING_STD(string);
+FG_USING_STD(istream);
 
-// #ifdef FG_HAVE_STD_INCLUDES
-// #include <istream>
-// #else
-// #include <istream.h>
-// #endif
 
 #include "zfstream.hxx"
 
-// Input stream manipulator function type.
-class fg_gzifstream;
-typedef fg_gzifstream& (*IManipFunc)( fg_gzifstream& );
-
 //-----------------------------------------------------------------------------
 //
 // Envelope class for gzifstream.
@@ -72,6 +70,8 @@ public:
 
     void attach( int fd, ios_openmode io_mode = ios_in|ios_binary );
 
+    void close() { gzbuf.close(); }
+
 private:
     // Not defined!
     fg_gzifstream( const fg_gzifstream& );    
@@ -92,6 +92,9 @@ istream& skipcomment( istream& in );
 #endif /* _FGSTREAM_HXX */
 
 // $Log$
+// Revision 1.6  1999/01/19 20:41:46  curt
+// Portability updates contributed by Bernie Bright.
+//
 // Revision 1.5  1998/11/06 14:05:13  curt
 // More portability improvements by Bernie Bright.
 //
diff --git a/Misc/strutils.hxx b/Misc/strutils.hxx
index 2cf7c53e9..d2e196af1 100644
--- a/Misc/strutils.hxx
+++ b/Misc/strutils.hxx
@@ -25,11 +25,15 @@
 #define STRUTILS_H
 
 #include <string>
-// #include <cstdlib>
-#include <stdlib.h>
+#include "Include/compiler.h"
 
-#include "Include/fg_stl_config.h"
-FG_USING_NAMESPACE(std);
+#ifdef FG_HAVE_STD_INCLUDES
+#  include <cstdlib>
+#else
+#  include <stdlib.h>
+#endif
+
+FG_USING_STD(string);
 
 // Default characters to remove.
 extern const string whitespace;
@@ -60,6 +64,9 @@ atoi( const string& str )
 #endif // STRUTILS_H
 
 // $Log$
+// Revision 1.4  1999/01/19 20:41:47  curt
+// Portability updates contributed by Bernie Bright.
+//
 // Revision 1.3  1998/10/16 00:50:57  curt
 // Remove leading _ from a couple defines.
 //
diff --git a/Misc/zfstream.cxx b/Misc/zfstream.cxx
index 759df91d8..38387cb89 100644
--- a/Misc/zfstream.cxx
+++ b/Misc/zfstream.cxx
@@ -25,8 +25,6 @@
 #include <memory.h>
 #include "zfstream.hxx"
 
-const int gzfilebuf::page_size;
-
 //
 // Construct a gzfilebuf object.
 // Allocate memory for 'get' buffer and zero all buffer pointers.
@@ -311,6 +309,9 @@ gzifstream::close()
 #endif
 
 // $Log$
+// Revision 1.3  1999/01/19 20:41:48  curt
+// Portability updates contributed by Bernie Bright.
+//
 // Revision 1.2  1998/11/06 14:05:14  curt
 // More portability improvements by Bernie Bright.
 //
diff --git a/Misc/zfstream.hxx b/Misc/zfstream.hxx
index 3e5c0d675..a2d82181c 100644
--- a/Misc/zfstream.hxx
+++ b/Misc/zfstream.hxx
@@ -44,6 +44,11 @@
 #  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);
+
 #else
 
 #  ifdef FG_HAVE_STREAMBUF
@@ -125,7 +130,7 @@ private:
     int ibuf_size;
     char* ibuffer;
 
-    static const int page_size = 4096;
+    enum { page_size = 4096 };
 
 private:
     // Not defined
@@ -147,6 +152,9 @@ struct gzifstream_base
 #endif // _zfstream_hxx
 
 // $Log$
+// Revision 1.7  1999/01/19 20:41:49  curt
+// Portability updates contributed by Bernie Bright.
+//
 // Revision 1.6  1998/12/07 21:10:26  curt
 // Portability improvements.
 //