From: jsing <jsing@openbsd.org>
Date: Fri, 25 Apr 2014 14:00:15 +0000 (+0000)
Subject: do_pipe_sig is now only used in openssl.c - just call signal() directly
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=20a3020c4669a509252f04726802569b65874ffb;p=openbsd

do_pipe_sig is now only used in openssl.c - just call signal() directly
from there instead and ditch the macro.
---

diff --git a/lib/libssl/src/apps/apps.h b/lib/libssl/src/apps/apps.h
index 1f013e358bb..41656f9b98b 100644
--- a/lib/libssl/src/apps/apps.h
+++ b/lib/libssl/src/apps/apps.h
@@ -132,8 +132,6 @@ extern BIO *bio_err;
 
 #include <signal.h>
 
-#define do_pipe_sig()	signal(SIGPIPE,SIG_IGN)
-
 #ifdef OPENSSL_NO_COMP
 #define zlib_cleanup()
 #else
diff --git a/lib/libssl/src/apps/openssl.c b/lib/libssl/src/apps/openssl.c
index 7070b4c896e..a12dc98f5e1 100644
--- a/lib/libssl/src/apps/openssl.c
+++ b/lib/libssl/src/apps/openssl.c
@@ -199,7 +199,7 @@ err:
 static void
 openssl_startup(void)
 {
-	do_pipe_sig();
+	signal(SIGPIPE, SIG_IGN);
 
 	CRYPTO_malloc_init();
 	ERR_load_crypto_strings();