Provide a default OPENSSL_ia32cap_loc for non-Intel platforms where

[openssl.git] / crypto / cryptlib.c

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 717c030e4c680ab6bf26d5caf42405fdff45c21c..7b86e599ff60911000f082c327340379c983d784 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -569,6 +569,8 @@ void OPENSSL_cpuid_setup(void)
 }
 #endif
 
+#else
+unsigned long *OPENSSL_ia32cap_loc(void) { return NULL; }
 #endif
 #if !defined(OPENSSL_CPUID_SETUP)
 void OPENSSL_cpuid_setup(void) {}
@@ -600,7 +602,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
                        nt_headers = (IMAGE_NT_HEADERS *)((char *)dos_header
                                                + dos_header->e_lfanew);
                        if (nt_headers->Signature==IMAGE_NT_SIGNATURE &&
-                           histDLL!=(HINSTANCE)(nt_headers->OptionalHeader.ImageBase))
+                           hinstDLL!=(HINSTANCE)(nt_headers->OptionalHeader.ImageBase))
                                OPENSSL_NONPIC_relocated=1;
                        }
                }
@@ -663,7 +665,7 @@ static int IsService(void)
 
 void OPENSSL_showfatal (const char *fmta,...)
 { va_list ap;
-  TCHAR buf[256]
+  TCHAR buf[256];
   const TCHAR *fmt;
   HANDLE h;