diff options
author | jsing <> | 2014-04-25 14:00:15 +0000 |
---|---|---|
committer | jsing <> | 2014-04-25 14:00:15 +0000 |
commit | 0faee25da83fca37a8c30b9acec73c76061d67f5 (patch) | |
tree | 047376f80a2a0c5bfb791019bec47eede16610ce /src | |
parent | b4a6d3907d1cdfcdfaf297726eea10c46127c3ad (diff) | |
download | openbsd-0faee25da83fca37a8c30b9acec73c76061d67f5.tar.gz openbsd-0faee25da83fca37a8c30b9acec73c76061d67f5.tar.bz2 openbsd-0faee25da83fca37a8c30b9acec73c76061d67f5.zip |
do_pipe_sig is now only used in openssl.c - just call signal() directly
from there instead and ditch the macro.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/src/apps/apps.h | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/apps/openssl.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libssl/src/apps/apps.h b/src/lib/libssl/src/apps/apps.h index 1f013e358b..41656f9b98 100644 --- a/src/lib/libssl/src/apps/apps.h +++ b/src/lib/libssl/src/apps/apps.h | |||
@@ -132,8 +132,6 @@ extern BIO *bio_err; | |||
132 | 132 | ||
133 | #include <signal.h> | 133 | #include <signal.h> |
134 | 134 | ||
135 | #define do_pipe_sig() signal(SIGPIPE,SIG_IGN) | ||
136 | |||
137 | #ifdef OPENSSL_NO_COMP | 135 | #ifdef OPENSSL_NO_COMP |
138 | #define zlib_cleanup() | 136 | #define zlib_cleanup() |
139 | #else | 137 | #else |
diff --git a/src/lib/libssl/src/apps/openssl.c b/src/lib/libssl/src/apps/openssl.c index 7070b4c896..a12dc98f5e 100644 --- a/src/lib/libssl/src/apps/openssl.c +++ b/src/lib/libssl/src/apps/openssl.c | |||
@@ -199,7 +199,7 @@ err: | |||
199 | static void | 199 | static void |
200 | openssl_startup(void) | 200 | openssl_startup(void) |
201 | { | 201 | { |
202 | do_pipe_sig(); | 202 | signal(SIGPIPE, SIG_IGN); |
203 | 203 | ||
204 | CRYPTO_malloc_init(); | 204 | CRYPTO_malloc_init(); |
205 | ERR_load_crypto_strings(); | 205 | ERR_load_crypto_strings(); |