From 28f4b7853c9e831a0fe5776dea0c6ad55c3f302a Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 23 Oct 1995 12:59:29 +0000
Subject: [PATCH] merge beta26 import conflicts

---
 usr.sbin/nslookup/subr.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/usr.sbin/nslookup/subr.c b/usr.sbin/nslookup/subr.c
index d7cca0e2a66a..7fcf25b7991c 100644
--- a/usr.sbin/nslookup/subr.c
+++ b/usr.sbin/nslookup/subr.c
@@ -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);