Mercurial > hg > octave-lojdl

changeset 6094:86ee3cc8d8d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-10-26 01:18:33 by jwe]
author jwe
date Thu, 26 Oct 2006 01:18:34 +0000
parents 174cfaa0c4af
children a8aa7a014c22
files ChangeLog configure.in src/ChangeLog src/oct-procbuf.cc
diffstat 4 files changed, 26 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-10-25  John W. Eaton  <jwe@octave.org>
 
+	* configure.in (*-*-msdosmsvc): Don't check for strftime.
+
 	* configure.in (INCLUDE_DEPS): Set and substitute.
 	(DEPEND_FLAGS, DEPEND_EXTRA_SED_PATTERN): Rearrange way these are set.
 
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.533 $)
+AC_REVISION($Revision: 1.534 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -1318,10 +1318,21 @@
   lstat memmove mkdir mkfifo mkstemp on_exit pipe poll putenv raise \
   readlink rename resolvepath rindex rmdir round select setgrent \
   setlocale setpwent setvbuf sigaction siglongjmp sigpending sigprocmask \
-  sigsuspend stat strcasecmp strdup strerror strftime stricmp \
+  sigsuspend stat strcasecmp strdup strerror stricmp \
   strncasecmp strnicmp strptime strsignal symlink tempnam umask \
   uname unlink usleep vfprintf vsprintf vsnprintf waitpid)
 
+case "$canonical_host_type" in
+  *-*-msdosmsvc)
+    ## The %T format specifier for strftime is reportedly broken,
+    ## so use our version.  We could use an actual configure test
+    ## for this.
+  ;;
+  *)
+    AC_CHECK_FUNCS(strftime)
+  ;;
+esac
+
 OCTAVE_SMART_PUTENV
 
 ### Dynamic linking is now enabled only if we are building shared
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-25  John W. Eaton  <jwe@octave.org>
+
+	* oct-procbuf.cc (BUFSIZ): Define if not already defined.
+	(octave_procbuf::open): Pass BUFSIZ as size argument to setvbuf.
+
 2006-10-25  Michael Goffioul  <michael.goffioul@swing.be>
 
 	* Makefile.in (XTRA_CDEFS, XTRA_CXXDEFS): Substitute here.
--- a/src/oct-procbuf.cc
+++ b/src/oct-procbuf.cc
@@ -59,6 +59,10 @@
 #define W32PCLOSE _pclose
 #endif
 
+#ifndef BUFSIZ
+#define BUFSIZ 1024
+#endif
+
 octave_procbuf *
 octave_procbuf::open (const char *command, int mode)
 {
@@ -79,7 +83,7 @@
   open_p = true;
 
   if (mode & std::ios::out)
-    ::setvbuf (f, 0, _IOLBF, 0);
+    ::setvbuf (f, 0, _IOLBF, BUFSIZ);
 
   return this;
   
@@ -149,7 +153,7 @@
   f = ::fdopen (parent_end, (mode & std::ios::in) ? "r" : "w");
 
   if (mode & std::ios::out)
-    ::setvbuf (f, 0, _IOLBF, 0);
+    ::setvbuf (f, 0, _IOLBF, BUFSIZ);
 
   open_p = true;