From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 26 Sep 2005 11:18:04 +0000 (+0000)
Subject: Update from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~1793
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=bfa4b8c5abe3660ab3f5c4d28af4b350abc8c2cb

Update from stable branch.
---

diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index f186a714dc..1f23a45a33 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -578,7 +578,9 @@ static int close_console(UI *ui)
 /* Internal functions to handle signals and act on them */
 static void pushsig(void)
 	{
+#ifndef OPENSSL_SYS_WIN32
 	int i;
+#endif
 #ifdef SIGACTION
 	struct sigaction sa;
 
@@ -623,8 +625,6 @@ static void pushsig(void)
 
 static void popsig(void)
 	{
-	int i;
-
 #ifdef OPENSSL_SYS_WIN32
 	signal(SIGABRT,savsig[SIGABRT]);
 	signal(SIGFPE,savsig[SIGFPE]);
@@ -633,6 +633,7 @@ static void popsig(void)
 	signal(SIGSEGV,savsig[SIGSEGV]);
 	signal(SIGTERM,savsig[SIGTERM]);
 #else
+	int i;
 	for (i=1; i<NX509_SIG; i++)
 		{
 #ifdef SIGUSR1