Mercurial > hg > octave-max
changeset 5977:27dd5b29489b
[project @ 2006-08-30 20:03:53 by jwe]
| author | jwe |
|---|---|
| date | Wed, 30 Aug 2006 20:03:53 +0000 |
| parents | b1a1c10bf2fd |
| children | 32cef2cfc9c9 |
| files | src/ChangeLog src/load-save.cc |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -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):
--- a/src/load-save.cc +++ b/src/load-save.cc @@ -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);