Mercurial > hg > octave-lyh > gnulib-hg
changeset 104:6b441e8a5e2b
merge with 3.8.3a
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Wed, 06 Oct 1993 00:24:28 +0000 |
parents | 9a98c3cdf12a |
children | 12f81400139d |
files | lib/fsusage.c lib/makepath.c |
diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -70,7 +70,7 @@ else if (fromsize > tosize) /* E.g., from 2048 to 512. */ return blocks * (fromsize / tosize); else /* E.g., from 256 to 512. */ - return (blocks + (blocks < 0 ? -1 : +1)) / (tosize / fromsize); + return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize); } /* Fill in the fields of FSP with information about space usage for
--- a/lib/makepath.c +++ b/lib/makepath.c @@ -38,8 +38,15 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif + +#ifdef STAT_MACROS_BROKEN +#ifdef S_ISDIR +#undef S_ISDIR +#endif +#endif /* STAT_MACROS_BROKEN. */ + #if !defined(S_ISDIR) && defined(S_IFDIR) -#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif #ifdef STDC_HEADERS