Mercurial > octave-nkf
changeset 4099:3add04256a60
[project @ 2002-10-10 06:23:03 by jwe]
| author | jwe |
|---|---|
| date | Thu, 10 Oct 2002 06:23:03 +0000 |
| parents | 8496ae60db8a |
| children | ed0090ecf80f |
| files | liboctave/file-ops.cc liboctave/file-ops.h liboctave/oct-env.cc |
| diffstat | 3 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/file-ops.cc Thu Oct 10 05:20:21 2002 +0000 +++ b/liboctave/file-ops.cc Thu Oct 10 06:23:03 2002 +0000 @@ -623,7 +623,7 @@ bool file_ops::is_dir_sep (char c) { -#if defined (__WIN32__) +#if defined (__WIN32__) || defined (__CYGWIN__) return (c == '/' || c == '\\'); #else return (c == '/');
--- a/liboctave/file-ops.h Thu Oct 10 05:20:21 2002 +0000 +++ b/liboctave/file-ops.h Thu Oct 10 06:23:03 2002 +0000 @@ -82,7 +82,7 @@ #define OCTAVE_DIR_SEP_CHAR '/' #define OCTAVE_DIR_SEP_STR "/" -#if defined (__WIN32__) +#if defined (__WIN32__) || defined (__CYGWIN__) #define OCTAVE_DIR_SEP_CHARS "/\\" #else #define OCTAVE_DIR_SEP_CHARS OCTAVE_DIR_SEP_STR
--- a/liboctave/oct-env.cc Thu Oct 10 05:20:21 2002 +0000 +++ b/liboctave/oct-env.cc Thu Oct 10 06:23:03 2002 +0000 @@ -239,12 +239,10 @@ if (len == 0) return false; -#if defined (__CYGWIN__) || ! defined (__WIN32__) if (file_ops::is_dir_sep (s[0])) return true; -#endif -#if defined (__WIN32__) +#if defined (__WIN32__) || defined (__CYGWIN__) if ((len == 2 && isalpha (s[0]) && s[1] == ':') || (len > 2 && isalpha (s[0]) && s[1] == ':' && file_ops::is_dir_sep (s[2])))