Mercurial > hg > octave-shane
changeset 10309:cd925a5a82df
another #undef for gnulib
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 11 Feb 2010 11:04:47 -0500 |
parents | 0d928dd9eeb8 |
children | cd14d826025f |
files | src/ChangeLog src/load-save.cc |
diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-02-11 John W. Eaton <jwe@octave.org> + + * load-save.cc: If gnulib defines open, undefine it. Move + #undefs before including zfstream.h. + 2010-01-30 Jyh-Miin Lin <jyhmiin@gmail.com> * DLD-FUNCTIONS/qz.cc (Fqz): Add support for complex case (no reordering yet).
--- a/src/load-save.cc +++ b/src/load-save.cc @@ -80,13 +80,16 @@ #include "ls-oct-ascii.h" #include "ls-oct-binary.h" -#ifdef HAVE_ZLIB -#include "zfstream.h" +// Remove gnulib definitions, if any. +#ifdef close +#undef close +#endif +#ifdef open +#undef open #endif -// Remove gnulib definition, if any. -#ifdef close -#undef close +#ifdef HAVE_ZLIB +#include "zfstream.h" #endif // Write octave-core file if Octave crashes or is killed by a signal.