# HG changeset patch
# User jwe
# Date 1156968233 0
# Node ID 27dd5b29489b99081bab727adeadc4f78ac1b72d
# Parent  b1a1c10bf2fdd9a6ff26e4dd70965e3c76b41da4
[project @ 2006-08-30 20:03:53 by jwe]

diff -r b1a1c10bf2fd -r 27dd5b29489b src/ChangeLog
--- a/src/ChangeLog	Wed Aug 30 20:02:52 2006 +0000
+++ b/src/ChangeLog	Wed Aug 30 20:03:53 2006 +0000
@@ -1,3 +1,7 @@
+2006-08-30  John W. Eaton  <jwe@octave.org>
+
+	* load-save.cc (get_file_format): Fix misplaced #endif.
+
 2006-08-29  John W. Eaton  <jwe@octave.org>
 
 	* load-path.cc (execute_pkg_add_or_del):
diff -r b1a1c10bf2fd -r 27dd5b29489b src/load-save.cc
--- a/src/load-save.cc	Wed Aug 30 20:02:52 2006 +0000
+++ b/src/load-save.cc	Wed Aug 30 20:03:53 2006 +0000
@@ -394,6 +394,7 @@
 
   return retval;
 }
+
 static load_save_format
 get_file_format (const std::string& fname, const std::string& orig_fname, 
 		 bool &use_zlib)
@@ -413,6 +414,7 @@
     {
       retval = get_file_format (file);
       file.close ();
+
 #ifdef HAVE_ZLIB
       if (retval == LS_UNKNOWN && check_gzip_magic (fname))	
 	{
@@ -425,6 +427,7 @@
 	      gzfile.close ();
 	    }
 	}
+#endif
 
       if (retval == LS_UNKNOWN)
 	{
@@ -437,8 +440,6 @@
 
 	  retval = LS_MAT_ASCII;
 	}
-
-#endif
     }
   else
     gripe_file_open ("load", orig_fname);