Mercurial > octave

diff src/file-io.cc @ 10197:4d433bd2d4dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
attempt to avoid trouble with gnulib #defines in a consistent way
author John W. Eaton <jwe@octave.org>
date Tue, 26 Jan 2010 00:45:04 -0500
parents 0522a65bcd56
children 2d47356a7a1a
line wrap: on
line diff
--- a/src/file-io.cc	Sat Jan 23 06:58:30 2010 +0100
+++ b/src/file-io.cc	Tue Jan 26 00:45:04 2010 -0500
@@ -1852,7 +1852,7 @@
   return retval;
 }
 
-DEFUN (tmpnam, args, ,
+DEFUNX ("tmpnam", Ftmpnam, args, ,
  "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} tmpnam (@var{dir}, @var{prefix})\n\
 Return a unique temporary file name as a string.\n\
@@ -1880,7 +1880,7 @@
 	    = len > 1 ? args(1).string_value () : std::string ("oct-");
 
 	  if (! error_state)
-	    retval = file_ops::tempnam (dir, pfx);
+	    retval = octave_tempnam (dir, pfx);
 	  else
 	    ::error ("expecting second argument to be a string");
 	}
@@ -2098,7 +2098,7 @@
   return retval;
 }
 
-DEFUN (umask, args, ,
+DEFUNX ("umask", Fumask, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} umask (@var{mask})\n\
 Set the permission mask for file creation.  The parameter @var{mask}\n\
@@ -2127,7 +2127,7 @@
 	      int oct_mask = convert (mask, 8, 10);
 
 	      if (! error_state)
-		status = convert (file_ops::umask (oct_mask), 10, 8);
+		status = convert (octave_umask (oct_mask), 10, 8);
 	    }
 	}
       else