commit b83eddc578dc37967700dc8ca04aad6fe49edfb3
author Dr. Stephen Henson <steve@openssl.org> Tue Nov 06 13:40:27 2001 +0000
committer Dr. Stephen Henson <steve@openssl.org> Tue Nov 06 13:40:27 2001 +0000
tree 4e70fbbdac83d47294b952c207f0f6ced40409f7
parent 7f558334adba23a412b169901046e3271250316b

Win32 fixes.

apps/speed.c

diff --git a/apps/speed.c b/apps/speed.c
index 5a88204..2b083aa 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -218,12 +218,6 @@
 #ifdef HAVE_FORK
 static int do_multi(int multi);
 #endif
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi) || defined(_AIX)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif 
 
 #define ALGOR_NUM	16
 #define SIZE_NUM	5
@@ -238,6 +232,13 @@
 static double rsa_results[RSA_NUM][2];
 static double dsa_results[DSA_NUM][2];
 
+#ifdef SIGALRM
+#if defined(__STDC__) || defined(sgi) || defined(_AIX)
+#define SIGRETTYPE void
+#else
+#define SIGRETTYPE int
+#endif 
+
 static SIGRETTYPE sig_done(int sig);
 static SIGRETTYPE sig_done(int sig)
 	{
@@ -893,9 +894,9 @@
 	do	{
 		long i;
 		count*=2;
-		Time_F(START,usertime);
+		Time_F(START);
 		for (i=count; i; i--)
-			des_ecb_encrypt(buf_as_des_cblock,buf_as_des_cblock,
+			DES_ecb_encrypt(buf_as_des_cblock,buf_as_des_cblock,
 				&sch,DES_ENCRYPT);
 		d=Time_F(STOP);
 		} while (d <3);
@@ -1441,7 +1442,9 @@
 		}
 	if (rnd_fake) RAND_cleanup();
 #endif
+#ifdef HAVE_FORK
 show_res:
+#endif
 	if(!mr)
 		{
 		fprintf(stdout,"%s\n",SSLeay_version(SSLEAY_VERSION));