Mercurial > hg > octave-thorsten

changeset 4081:e5966ddef842

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2002-09-30 22:33:41 by jwe]
author jwe
date Mon, 30 Sep 2002 22:33:41 +0000
parents 8683d23356cb
children b8bae1ba4651
files ChangeLog configure.in liboctave/ChangeLog liboctave/file-ops.cc src/sysdep.cc
diffstat 5 files changed, 13 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-30  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in: Don't define mkdir here.
+
 2002-09-25  Mumit Khan  <khan@nanotech.wisc.edu>
  
  	* aclocal.m4 (OCTAVE_MKDIR_TAKES_ONE_ARG): New macro to determine if
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,7 @@
 ### 02111-1307, USA. 
 
 AC_INIT
-AC_REVISION($Revision: 1.369 $)
+AC_REVISION($Revision: 1.370 $)
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -1260,10 +1260,6 @@
 #if !defined(HAVE_SIGSET_T)
 typedef int sigset_t;
 #endif
-
-#if defined(MKDIR_TAKES_ONE_ARG)
-#  define mkdir(a,b) mkdir(a)
-#endif
 ])
 
 ### Do the substitutions in all the Makefiles.
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,5 +1,7 @@
 2002-09-30  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* file-ops.cc (file_ops::mkdir): Handle one-arg mkdir here.
+
 	* lo-specfun.cc (acosh): Call xdacosh, not dacosh.
 
 2002-09-27  Per Persson <persquare@mac.com>
--- a/liboctave/file-ops.cc
+++ b/liboctave/file-ops.cc
@@ -66,7 +66,12 @@
   int status = -1;
 
 #if defined (HAVE_MKDIR)
+
+#if defined (MKDIR_TAKES_ONE_ARG)
+  status = ::mkdir (name.c_str ());
+#else
   status = ::mkdir (name.c_str (), mode);
+#endif
 
   if (status < 0)
     {
--- a/src/sysdep.cc
+++ b/src/sysdep.cc
@@ -319,10 +319,7 @@
 octave_kbhit (bool wait)
 {
 #ifdef HAVE__KBHIT
-  if (! wait && ! _kbhit ())
-    c = 0;
-  else
-    c = std::cin.get ();
+  int c = (! wait && ! _kbhit ()) ? 0 : std::cin.get ();
 #else
   raw_mode (true, wait);