Mercurial > octave-nkf
changeset 10305:d6cdf08d0424
load-save.cc: avoid gnulib definition of close
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 10 Feb 2010 22:53:40 -0500 |
| parents | 2ceae0b40515 |
| children | 7b5e8527441e |
| files | src/ChangeLog src/load-save.cc |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Feb 10 22:12:36 2010 +0100 +++ b/src/ChangeLog Wed Feb 10 22:53:40 2010 -0500 @@ -1,3 +1,7 @@ +2010-02-10 John W. Eaton <jwe@octave.org> + + * load-save.cc: If gnulib defines close, undefine it. + 2010-02-10 Jaroslav Hajek <highegg@gmail.com> * ov-perm.h (octave_perm_matrix::builtin_type): New function.
--- a/src/load-save.cc Wed Feb 10 22:12:36 2010 +0100 +++ b/src/load-save.cc Wed Feb 10 22:53:40 2010 -0500 @@ -84,6 +84,11 @@ #include "zfstream.h" #endif +// Remove gnulib definition, if any. +#ifdef close +#undef close +#endif + // Write octave-core file if Octave crashes or is killed by a signal. static bool Vcrash_dumps_octave_core = true;