--- a/src/ChangeLog	Thu Feb 11 16:08:03 2010 +0100
+++ b/src/ChangeLog	Thu Feb 11 11:04:47 2010 -0500
@@ -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	Thu Feb 11 16:08:03 2010 +0100
+++ b/src/load-save.cc	Thu Feb 11 11:04:47 2010 -0500
@@ -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.