Modified Files:

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

diff --git a/simgear/misc/zfstream.cxx b/simgear/misc/zfstream.cxx
index 7dcf701f131002cc8bc1114df8dba5d6f7a475d3..97865bc8664b03a6895fef7c2bbdd9fd02b8e92b 100644 (file)
--- a/simgear/misc/zfstream.cxx
+++ b/simgear/misc/zfstream.cxx
@@ -15,16 +15,15 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// 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.
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
 #include <simgear/compiler.h>
 
-#ifdef FG_HAVE_STD_INCLUDES
+#ifdef SG_HAVE_STD_INCLUDES
 # include <cerrno>
 #else
 # include <errno.h>
@@ -41,7 +40,7 @@
 gzfilebuf::gzfilebuf()
     : streambuf(),
       file(NULL),
-#if defined( __MWERKS__ )
+#if defined( __MWERKS__ ) || __GNUC__ > 2
       mode(ios_openmode(0)),
 #else
       mode(0),
@@ -116,7 +115,7 @@ gzfilebuf::open( const char *name, ios_openmode io_mode )
     char char_mode[10];
     cvt_iomode( char_mode, io_mode );
     if ( (file = gzopen(name, char_mode)) == NULL ) {
-       perror( "gzfilebuf::open(): " );
+       // perror( "gzfilebuf::open(): " );
        errno = 0;
        return NULL;
     }