changeset 6275:6e5835ef21f8

[project @ 2007-02-07 07:29:46 by jwe]
author jwe
date Wed, 07 Feb 2007 07:29:47 +0000
parents d42abdfcb8e9
children d26c558691cd
files README.MSVC src/ChangeLog src/zfstream.cc
diffstat 3 files changed, 21 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/README.MSVC	Wed Feb 07 07:22:03 2007 +0000
+++ b/README.MSVC	Wed Feb 07 07:29:47 2007 +0000
@@ -193,11 +193,22 @@
 http://www.netlib.org/f2c/libf2c.zip.
 
 To compile libf2c, use makefile.vc and NMAKE.EXE.  To be usable within
-Octave, first edit makefile.vc and add "-MD" as compilation flag (to
-the CFLAGS variable).  Finally, install f2c.h and vcf2c.lib at
-locations where they can be found by the MSVC tools (adjust the
-INCLUDE and LIB variables).  Note that you must rename vcf2c.lib into
-f2c.lib so that Octave's configure script will find it.
+Octave, the following modifications needs to be done:
+  1) edit makefile.vc and add "-MD" as compilation flag (to
+     the CFLAGS variable).
+  2) edit fio.h and comment the declaration of isatty (around line 112).
+     This means replacing the line:
+
+		extern int isatty(int);
+
+     with
+
+		/* extern int isatty(int); */
+
+After compilation, install f2c.h and vcf2c.lib at locations where they
+can be found by the MSVC tools (adjust the INCLUDE and LIB variables).
+Note that you must rename vcf2c.lib into f2c.lib so that Octave's
+configure script will find it.
 
 
 2. Compilation
--- a/src/ChangeLog	Wed Feb 07 07:22:03 2007 +0000
+++ b/src/ChangeLog	Wed Feb 07 07:29:47 2007 +0000
@@ -1,5 +1,7 @@
 2007-02-07  John W. Eaton  <jwe@octave.org>
 
+	* zfstream.cc (gzfilebuf::open_mode): Always append "b" to c_mode.
+
 	* toplev.cc (Foctave_config_info): Use struct for conf_info.
 	Call subst_octave_home on selected values when initializing map.
 	* defaults.cc (subst_octave_home): Now extern.
--- a/src/zfstream.cc	Wed Feb 07 07:22:03 2007 +0000
+++ b/src/zfstream.cc	Wed Feb 07 07:29:47 2007 +0000
@@ -187,8 +187,9 @@
   // Mode string should be empty for invalid combination of flags
   if (strlen(c_mode) == 0)
     return false;
-  if (testb)
-    strcat(c_mode, "b");
+
+  strcat(c_mode, "b");
+
   return true;
 }