diff options
| author | Jim Meyering <jim@meyering.net> | 1999-04-04 23:15:07 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1999-04-04 23:15:07 +0000 |
| commit | 5050912be0fcf7754bc004aa77809b4dea9a4764 (patch) | |
| tree | dac8d7b0fdc2abb0cc52c1e19d1f8dce804b080f | |
| parent | a147c611416a32254d177a58bbe099dcc830d6bc (diff) | |
| download | coreutils-5050912be0fcf7754bc004aa77809b4dea9a4764.tar.xz | |
Don't include string.h.
[!HAVE_CONFIG_H]: Include string.h here.
[!HAVE_CONFIG_H]: Hard-code RETSIGTYPE to `int'.
(sigill_handler): Change return type and type of local `oldhandler' to
RETSIGTYPE.
(isaac_seed_machdep): Change and type of local `oldhandler' to
RETSIGTYPE.
| -rw-r--r-- | src/shred.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/shred.c b/src/shred.c index 7317395d8..a279d9247 100644 --- a/src/shred.c +++ b/src/shred.c @@ -86,7 +86,6 @@ #include <getopt.h> #include <stdio.h> -#include <string.h> /* For memcpy(), strerror() */ #include <stdarg.h> /* Used by pferror */ #include <setjmp.h> #include <signal.h> @@ -118,6 +117,7 @@ * but it's a lot less intertwingled than the usual GNU utilities. */ +# include <string.h> /* For memcpy(), strerror() */ # include <limits.h> /* For ULONG_MAX etc. */ # include <stdlib.h> /* For strtoul, EXIT_FAILURE */ # include <errno.h> @@ -151,9 +151,12 @@ # endif # endif +# define RETSIGTYPE int; + # ifndef O_NOCTTY # define O_NOCTTY 0 /* This is a very optional frill */ # endif + # ifndef S_IWUSR # ifdef S_IWRITE # define S_IWUSR S_IWRITE @@ -759,7 +762,8 @@ isaac_seed_finish(struct isaac_state *s) * possibility of SIGILL while we're working. */ static jmp_buf env; -static void sigill_handler(int signum) +static RETSIGTYPE +sigill_handler(int signum) { (void)signum; longjmp(env, 1); /* Trivial, just return an indication that it happened */ @@ -768,7 +772,7 @@ static void sigill_handler(int signum) static void isaac_seed_machdep(struct isaac_state *s) { - void (*oldhandler)(int); + RETSIGTYPE (*oldhandler)(int); /* This is how one does try/except in C */ oldhandler = signal(SIGILL, sigill_handler); |