Mercurial > octave-nkf
changeset 5622:8b7046423d1e
[project @ 2006-02-15 16:36:32 by jwe]
| author | jwe |
|---|---|
| date | Wed, 15 Feb 2006 16:36:32 +0000 |
| parents | 7ef7b8388901 |
| children | 691de3e3c2f8 |
| files | liboctave/ChangeLog liboctave/kpse.cc |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Wed Feb 15 16:13:22 2006 +0000 +++ b/liboctave/ChangeLog Wed Feb 15 16:36:32 2006 +0000 @@ -1,5 +1,8 @@ 2006-02-15 John W. Eaton <jwe@octave.org> + * kpse.cc: Do define ST_NLINK_TRICK for Cygwin systems. + (do_subdir) [ST_NLINK_TRICK]: Check links != 2 instead of links > 2. + * getopt.c: Use __CYGWIN__ instead of __CYGWIN32__. 2006-02-13 David Bateman <dbateman@free.fr>
--- a/liboctave/kpse.cc Wed Feb 15 16:13:22 2006 +0000 +++ b/liboctave/kpse.cc Wed Feb 15 16:36:32 2006 +0000 @@ -73,9 +73,8 @@ /* If you want to find subdirectories in a directory with non-Unix semantics (specifically, if a directory with no subdirectories does - not have exactly two links), define this. Cygwin systems do not - have Unix semantics for network mapped drives. */ -#if defined(__DJGPP__) || ! (defined (DOSISH) || defined (__CYGWIN__)) + not have exactly two links), define this. */ +#if defined(__DJGPP__) || ! defined (DOSISH) /* Surprise! DJGPP returns st_nlink exactly like on Unix. */ #define ST_NLINK_TRICK #endif /* either not DOSISH or __DJGPP__ */ @@ -2274,7 +2273,7 @@ some such, we can still find subdirectories, even if it is much slower. */ #ifdef ST_NLINK_TRICK - if (links > 2) + if (links != 2) #endif /* not ST_NLINK_TRICK */ /* All criteria are met; find subdirectories. */ do_subdir (str_list_ptr, name, potential_len, post);