Skip to content

Commit

Permalink
- (bal) [openbsd-compat/bsd-misc.c] unset 'signal' defined if we are
Browse files Browse the repository at this point in the history
   using a real 'signal()' (Noticed by a NeXT Compile)
  • Loading branch information
mouring committed Dec 18, 2003
1 parent e937be3 commit 563eb99
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1605,4 +1607,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from [email protected], diagnosis from [email protected]

$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 $
4 changes: 2 additions & 2 deletions openbsd-compat/bsd-misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -164,7 +164,6 @@ int nanosleep(const struct timespec *req, struct timespec *rem)

return(rc);
}

#endif

#ifndef HAVE_TCGETPGRP
Expand Down Expand Up @@ -223,6 +222,7 @@ mysignal(int sig, mysig_t act)
}
return (osa.sa_handler);
#else
#undef signal
return (signal(sig, act));
#endif
}

0 comments on commit 563eb99

Please sign in to comment.