diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2003-12-18 00:34:06 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2003-12-18 00:34:06 +0000 |
commit | 563eb99711026601974115e7d2084ad9b676a188 (patch) | |
tree | 0c6ac6157e79bbcc2cde76991338a3445b73ccc3 /openbsd-compat/bsd-misc.c | |
parent | e937be36c309fff54978e56159503bcfee76d4c0 (diff) |
- (bal) [openbsd-compat/bsd-misc.c] unset 'signal' defined if we are
using a real 'signal()' (Noticed by a NeXT Compile)
Diffstat (limited to 'openbsd-compat/bsd-misc.c')
-rw-r--r-- | openbsd-compat/bsd-misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c index 08b089bdc..44f4fcc1e 100644 --- a/openbsd-compat/bsd-misc.c +++ b/openbsd-compat/bsd-misc.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | #include "xmalloc.h" | 26 | #include "xmalloc.h" |
27 | 27 | ||
28 | RCSID("$Id: bsd-misc.c,v 1.19 2003/08/25 01:16:21 mouring Exp $"); | 28 | RCSID("$Id: bsd-misc.c,v 1.20 2003/12/18 00:34:07 mouring Exp $"); |
29 | 29 | ||
30 | /* | 30 | /* |
31 | * NB. duplicate __progname in case it is an alias for argv[0] | 31 | * NB. duplicate __progname in case it is an alias for argv[0] |
@@ -164,7 +164,6 @@ int nanosleep(const struct timespec *req, struct timespec *rem) | |||
164 | 164 | ||
165 | return(rc); | 165 | return(rc); |
166 | } | 166 | } |
167 | |||
168 | #endif | 167 | #endif |
169 | 168 | ||
170 | #ifndef HAVE_TCGETPGRP | 169 | #ifndef HAVE_TCGETPGRP |
@@ -223,6 +222,7 @@ mysignal(int sig, mysig_t act) | |||
223 | } | 222 | } |
224 | return (osa.sa_handler); | 223 | return (osa.sa_handler); |
225 | #else | 224 | #else |
225 | #undef signal | ||
226 | return (signal(sig, act)); | 226 | return (signal(sig, act)); |
227 | #endif | 227 | #endif |
228 | } | 228 | } |