Blow away Makefile.ssl.

[openssl.git] / crypto / cryptlib.c

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 23264ec8234b20a2919df3cf8c1851e99ca7d7bf..3cfcb9e60243e69c0535cb16df4c15db014c44cd 100644 (file)
--- 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,16 +570,19 @@ void OPENSSL_cpuid_setup()
 
 #endif
 #if !defined(OPENSSL_CPUID_SETUP)
-void OPENSSL_cpuid_setup() {}
+void OPENSSL_cpuid_setup(void) {}
 #endif
 
-#ifdef _DLL
-#ifdef OPENSSL_SYS_WIN32
+#if (defined(_WIN32) || defined(__CYGWIN__)) && defined(_DLL)
+#ifdef __CYGWIN__
+/* pick DLL_[PROCESS|THREAD]_[ATTACH|DETACH] definitions */
+#include <windows.h>
+#endif
 
 /* All we really need to do is remove the 'error' state when a thread
  * detaches */
 
-BOOL WINAPI DLLEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason,
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
             LPVOID lpvReserved)
        {
        switch(fdwReason)
@@ -597,8 +602,6 @@ BOOL WINAPI DLLEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason,
        }
 #endif
 
-#endif
-
 void OpenSSLDie(const char *file,int line,const char *assertion)
        {
        fprintf(stderr,