summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2014-04-25 14:00:16 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2014-04-25 14:00:16 +0000
commitbc344de3497247983cfca5da9e5966e95012aefc (patch)
treefa78395699ed7da9905a69740608d80acf85c803
parent705ba23c082fc49dc1ef6808d74f7523f86a0b25 (diff)
do_pipe_sig is now only used in openssl.c - just call signal() directly
from there instead and ditch the macro.
-rw-r--r--lib/libssl/src/apps/apps.h2
-rw-r--r--lib/libssl/src/apps/openssl.c2
2 files changed, 1 insertions, 3 deletions
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();