Mercurial > hg > octave-lyh
changeset 6709:dda2239726cb
[project @ 2007-06-13 06:49:41 by jwe]
author | jwe |
---|---|
date | Wed, 13 Jun 2007 06:49:41 +0000 |
parents | 0ce71beb1cf3 |
children | 95ecf87531ca |
files | liboctave/ChangeLog liboctave/file-ops.cc |
diffstat | 2 files changed, 3 insertions(+), 59 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -65,15 +65,9 @@ 2007-06-06 Michael Goffioul <michael.goffioul@swing.be> - * file-ops.cc: Include sys/stat.h, fcntl.h, and utime.h or - sys/utime.h if they are available. - If _chmod is available but chmod is not, define chmod to _chmod - and define HAVE_CHMOD. Likewise for utime and utimbuf. - If _S_IFMT is defined but S_IFMT is not, define S_IFMT to _S_IFMT. - Likewise for _O_RDONLY, _O_WRONLY, _O_CREAT and _O_BINARY. - (tilde_find_suffix, isolate_tilde_prefix, tilde_expand_word): - Use file_ops::is_dir_sep instead of comparing with - file_ops::dir_sep_char. + * file-ops.cc (tilde_find_suffix, isolate_tilde_prefix, + tilde_expand_word): Use file_ops::is_dir_sep instead of comparing + with file_ops::dir_sep_char. * MArray-C.cc: Sprinkle with OCTINTERP_API as needed.
--- a/liboctave/file-ops.cc +++ b/liboctave/file-ops.cc @@ -41,20 +41,6 @@ #include <unistd.h> #endif -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif - -#ifdef HAVE_FCNTL_H -#include <fcntl.h> -#endif - -#if defined (HAVE_UTIME_H) -#include <utime.h> -#elif defined (HAVE_SYS_UTIME_H) -#include <sys/utime.h> -#endif - #include "dir-ops.h" #include "file-ops.h" #include "file-stat.h" @@ -83,42 +69,6 @@ std::string file_ops::dir_sep_chars (file_ops::dir_sep_str); #endif -#if ! defined (HAVE_CHMOD) && defined (HAVE__CHMOD) -#define chmod _chmod -#define HAVE_CHMOD 1 -#endif - -#if ! defined (HAVE_UTIME) \ - && (defined (HAVE__UTIME) || defined (HAVE__UTIME32)) -#define utime _utime -#define utimbuf _utimbuf -#define HAVE_UTIME 1 -#endif - -#if ! defined (S_IFMT) && defined (_S_IFMT) -#define S_IFMT _S_IFMT -#endif - -#if ! defined (O_RDONLY) && defined (_O_RDONLY) -#define O_RDONLY _O_RDONLY -#endif - -#if ! defined (O_WRONLY) && defined (_O_WRONLY) -#define O_WRONLY _O_WRONLY -#endif - -#if ! defined (O_CREAT) && defined (_O_CREAT) -#define O_CREAT _O_CREAT -#endif - -#ifndef O_BINARY -#ifdef _O_BINARY -#define O_BINARY _O_BINARY -#else -#define O_BINARY 0 -#endif -#endif - // We provide a replacement for mkdir(). int