diff --git a/ChangeLog b/ChangeLog index f768edcb3..4ed805c70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,8 @@ - (dtucker) [acconfig.h configure.ac uidswap.c] Bug #645: Check for setres[ug]id() present but not implemented (eg some Linux/glibc combinations). + - (bal) [openbsd-compat/bsd-misc.c] unset 'signal' defined if we are + using a real 'signal()' (Noticed by a NeXT Compile) 20031209 - (dtucker) OpenBSD CVS Sync @@ -1605,4 +1607,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3148 2003/12/17 07:53:26 dtucker Exp $ +$Id: ChangeLog,v 1.3149 2003/12/18 00:34:06 mouring Exp $ 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 @@ #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 }