diff options
| author | Jim Meyering <jim@meyering.net> | 1993-04-01 04:12:31 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1993-04-01 04:12:31 +0000 |
| commit | def996ca60014ba6ad189932d44d332e0e9a6380 (patch) | |
| tree | 8fb024f11d562e2d66d9d02c4f53810a023c7d80 | |
| parent | 0f4b670f25590e80922592b9ccce85cb41113f37 (diff) | |
| download | coreutils-def996ca60014ba6ad189932d44d332e0e9a6380.tar.xz | |
Define isascii macro to be 1 also if STDC_HEADERS.
| -rw-r--r-- | lib/backupfile.c | 38 | ||||
| -rw-r--r-- | old/fileutils/ChangeLog | 2 | ||||
| -rw-r--r-- | src/chgrp.c | 2 | ||||
| -rw-r--r-- | src/install.c | 2 |
4 files changed, 22 insertions, 22 deletions
diff --git a/lib/backupfile.c b/lib/backupfile.c index c6d7914a6..5d8fe25fa 100644 --- a/lib/backupfile.c +++ b/lib/backupfile.c @@ -15,14 +15,14 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* David MacKenzie <djm@ai.mit.edu>. +/* David MacKenzie <djm@gnu.ai.mit.edu>. Some algorithms adapted from GNU Emacs. */ #include <stdio.h> #include <ctype.h> #include <sys/types.h> #include "backupfile.h" -#if defined(USG) || defined(STDC_HEADERS) +#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) #include <string.h> #define index strchr #define rindex strrchr @@ -30,25 +30,22 @@ #include <strings.h> #endif -#ifdef DIRENT +#if defined(DIRENT) || defined(_POSIX_VERSION) #include <dirent.h> -#ifdef direct -#undef direct -#endif -#define direct dirent #define NLENGTH(direct) (strlen((direct)->d_name)) -#else /* !DIRENT */ +#else /* not (DIRENT or _POSIX_VERSION) */ +#define dirent direct #define NLENGTH(direct) ((direct)->d_namlen) -#ifdef USG #ifdef SYSNDIR #include <sys/ndir.h> -#else /* !SYSNDIR */ -#include <ndir.h> -#endif /* !SYSNDIR */ -#else /* !USG */ +#endif /* SYSNDIR */ +#ifdef SYSDIR #include <sys/dir.h> -#endif /* !USG */ -#endif /* !DIRENT */ +#endif /* SYSDIR */ +#ifdef NDIR +#include <ndir.h> +#endif /* NDIR */ +#endif /* DIRENT or _POSIX_VERSION */ #ifdef VOID_CLOSEDIR /* Fake a return value. */ @@ -63,12 +60,13 @@ char *malloc (); #endif -#ifndef isascii -#define ISDIGIT(c) (isdigit ((unsigned char) (c))) -#else -#define ISDIGIT(c) (isascii (c) && isdigit (c)) +#if !defined (isascii) || defined (STDC_HEADERS) +#define isascii(c) 1 #endif +#define ISDIGIT(c) (isascii ((unsigned char ) c) \ + && isdigit ((unsigned char) (c))) + #if defined (HAVE_UNISTD_H) #include <unistd.h> #endif @@ -138,7 +136,7 @@ max_backup_version (file, dir) char *file, *dir; { DIR *dirp; - struct direct *dp; + struct dirent *dp; int highest_version; int this_version; int file_name_length; diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog index 5c2b69a6a..728f04968 100644 --- a/old/fileutils/ChangeLog +++ b/old/fileutils/ChangeLog @@ -1,6 +1,8 @@ Wed Mar 31 22:03:28 1993 Jim Meyering (meyering@comco.com) * configure.in [MVDIR]: Don't quote right hand side. + * backupfile.c, chgrp.c, install.c: Define isascii macro to be 1 + also if STDC_HEADERS. Tue Mar 30 17:42:11 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) diff --git a/src/chgrp.c b/src/chgrp.c index 3e6c82d7e..2d4fe213e 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -24,7 +24,7 @@ #include <getopt.h> #include "system.h" -#ifndef isascii +#if !defined (isascii) || defined (STDC_HEADERS) #define isascii(c) 1 #endif diff --git a/src/install.c b/src/install.c index f0bbbbd92..4fccb8447 100644 --- a/src/install.c +++ b/src/install.c @@ -61,7 +61,7 @@ #include "system.h" #include "modechange.h" -#ifndef isascii +#if !defined (isascii) || defined (STDC_HEADERS) #define isascii(c) 1 #endif |