mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-04 09:09:56 +00:00
merge beta26 import conflicts
This commit is contained in:
parent
688444459d
commit
28f4b7853c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=11717
@ -55,7 +55,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static char sccsid[] = "@(#)subr.c 5.24 (Berkeley) 3/2/91";
|
||||
static char rcsid[] = "$Id: subr.c,v 1.3 1995/05/30 03:49:20 rgrimes Exp $";
|
||||
static char rcsid[] = "$Id: subr.c,v 1.4 1995/08/20 22:32:50 peter Exp $";
|
||||
#endif /* not lint */
|
||||
|
||||
/*
|
||||
@ -176,12 +176,22 @@ Malloc(size)
|
||||
signal(SIGINT, old);
|
||||
}
|
||||
#endif
|
||||
#else
|
||||
#ifdef POSIX_SIGNALS
|
||||
{ sigset_t sset;
|
||||
sigemptyset(&sset);
|
||||
sigaddset(&sset,SIGINT);
|
||||
sigprocmask(SIG_BLOCK,&sset,NULL);
|
||||
ptr = malloc((unsigned) size);
|
||||
sigprocmask(SIG_UNBLOCK,&sset,NULL);
|
||||
}
|
||||
#else
|
||||
{ int saveMask;
|
||||
saveMask = sigblock(sigmask(SIGINT));
|
||||
ptr = malloc((unsigned) size);
|
||||
(void) sigsetmask(saveMask);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
if (ptr == NULL) {
|
||||
fflush(stdout);
|
||||
|
Loading…
Reference in New Issue
Block a user