X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=crypto%2Fcryptlib.c;h=3cfcb9e60243e69c0535cb16df4c15db014c44cd;hb=42ba5d2329a2705d45417db3dd374c677eb47e05;hp=419d37ca5dd660ffa036ed0bd99bbca308f23bdf;hpb=c77094415f196153a8377f23487d67b2692a1aab;p=openssl.git

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 419d37ca5d..3cfcb9e602 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -539,25 +539,27 @@ const char *CRYPTO_get_lock_name(int type)
 		return(sk_value(app_locks,type-CRYPTO_NUM_LOCKS));
 	}
 
-#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)
+#if	defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
+	defined(__INTEL__) || \
+	defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64)
 
-unsigned long  OPENSSL_ia32cap=0;
-unsigned long *OPENSSL_ia32cap_loc() { return &OPENSSL_ia32cap; }
+unsigned long  OPENSSL_ia32cap_P=0;
+unsigned long *OPENSSL_ia32cap_loc(void) { return &OPENSSL_ia32cap_P; }
 
 #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
 #define OPENSSL_CPUID_SETUP
-void OPENSSL_cpuid_setup()
+void OPENSSL_cpuid_setup(void)
 { static int trigger=0;
-  unsigned long OPENSSL_ia32_cpuid();
+  unsigned long OPENSSL_ia32_cpuid(void);
   char *env;
 
     if (trigger)	return;
 
     trigger=1;
     if ((env=getenv("OPENSSL_ia32cap")))
-	OPENSSL_ia32cap = strtoul(env,NULL,0)|(1<<10);
+	OPENSSL_ia32cap_P = strtoul(env,NULL,0)|(1<<10);
     else
-	OPENSSL_ia32cap = OPENSSL_ia32_cpuid()|(1<<10);
+	OPENSSL_ia32cap_P = OPENSSL_ia32_cpuid()|(1<<10);
     /*
      * |(1<<10) sets a reserved bit to signal that variable
      * was initialized already... This is to avoid interference
@@ -568,7 +570,7 @@ void OPENSSL_cpuid_setup()
 
 #endif
 #if !defined(OPENSSL_CPUID_SETUP)
-void OPENSSL_cpuid_setup() {}
+void OPENSSL_cpuid_setup(void) {}
 #endif
 
 #if (defined(_WIN32) || defined(__CYGWIN__)) && defined(_DLL)