From aeb8d94b6bd2bfa4da2681d4609956607aa9ed7a Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 25 Nov 2019 13:27:33 +0100 Subject: [PATCH] apps/ocsp.c: sock_timeout -> socket_timeout It appears that 'sock_timeout' is defined at least with DJGPP, so we rename our symbol and hope the new name isn't taken. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/10515) (cherry picked from commit e9b95e42fbae668cb605287fa462a0d5f58b9caf) --- apps/ocsp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/ocsp.c b/apps/ocsp.c index 5d23918169..b85a4d82c1 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -114,7 +114,7 @@ static int acfd = (int) INVALID_SOCKET; static int index_changed(CA_DB *); static void spawn_loop(void); static int print_syslog(const char *str, size_t len, void *levPtr); -static void sock_timeout(int signum); +static void socket_timeout(int signum); # endif # ifndef OPENSSL_NO_SOCK @@ -597,7 +597,7 @@ int ocsp_main(int argc, char **argv) if (multi && acbio != NULL) spawn_loop(); if (acbio != NULL && req_timeout > 0) - signal(SIGALRM, sock_timeout); + signal(SIGALRM, socket_timeout); #endif if (acbio != NULL) @@ -1352,7 +1352,7 @@ static int urldecode(char *p) # endif # ifdef OCSP_DAEMON -static void sock_timeout(int signum) +static void socket_timeout(int signum) { if (acfd != (int)INVALID_SOCKET) (void)shutdown(acfd, SHUT_RD); -- 2.25.1