Mercurial > octave-nkf
changeset 4377:ced2ac0cff7b
[project @ 2003-04-17 19:13:25 by jwe]
| author | jwe |
|---|---|
| date | Thu, 17 Apr 2003 19:13:25 +0000 |
| parents | bfb14347a9fa |
| children | 7d48a8fba1d4 |
| files | ChangeLog configure.in |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Apr 17 14:33:12 2003 +0000 +++ b/ChangeLog Thu Apr 17 19:13:25 2003 +0000 @@ -1,3 +1,8 @@ +2003-04-17 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in (AH_BOTTOM): Don't assume that __WIN32__ will be + defined when __CYGWIN__ is defined. + 2003-03-17 John W. Eaton <jwe@bevo.che.wisc.edu> * configure.in: Only complain for g++ earlier than 2.95.
--- a/configure.in Thu Apr 17 14:33:12 2003 +0000 +++ b/configure.in Thu Apr 17 19:13:25 2003 +0000 @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.422 $) +AC_REVISION($Revision: 1.423 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -1375,11 +1375,14 @@ #define OCTAVE_HAVE_POSIX_FILESYSTEM 1 -#if defined (__WIN32__) +#if defined (__WIN32__) && ! defined (__CYGWIN__) #define OCTAVE_HAVE_WINDOWS_FILESYSTEM 1 -#if ! defined (__CYGWIN__) #undef OCTAVE_HAVE_POSIX_FILESYSTEM #endif + +#if defined (__CYGWIN__) +#define OCTAVE_HAVE_WINDOWS_FILESYSTEM 1 +#define OCTAVE_HAVE_POSIX_FILESYSTEM 1 #endif /* Define if we expect to have <windows.h>, Sleep, etc. */