summaryrefslogtreecommitdiff
path: root/openbsd-compat/bsd-misc.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2003-12-18 00:34:06 +0000
committerBen Lindstrom <mouring@eviladmin.org>2003-12-18 00:34:06 +0000
commit563eb99711026601974115e7d2084ad9b676a188 (patch)
tree0c6ac6157e79bbcc2cde76991338a3445b73ccc3 /openbsd-compat/bsd-misc.c
parente937be36c309fff54978e56159503bcfee76d4c0 (diff)
downloadopenssh-git-563eb99711026601974115e7d2084ad9b676a188.tar.gz
- (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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index 08b089bd..44f4fcc1 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -25,7 +25,7 @@
#include "includes.h"
#include "xmalloc.h"
-RCSID("$Id: bsd-misc.c,v 1.19 2003/08/25 01:16:21 mouring Exp $");
+RCSID("$Id: bsd-misc.c,v 1.20 2003/12/18 00:34:07 mouring Exp $");
/*
* 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)
return(rc);
}
-
#endif
#ifndef HAVE_TCGETPGRP
@@ -223,6 +222,7 @@ mysignal(int sig, mysig_t act)
}
return (osa.sa_handler);
#else
+ #undef signal
return (signal(sig, act));
#endif
}