X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fcryptlib.c;h=e73d086eedd099e7be67f3f7b9aea940fe8ec988;hp=717c030e4c680ab6bf26d5caf42405fdff45c21c;hb=88737991d2c88cd8d7bebe506f3c26531fa282e0;hpb=51d28013db89b6ebecd0c89bd7f527aeddda0a98

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 717c030e4c..e73d086eed 100644
--- 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;
 			}
 		}
@@ -618,11 +620,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
 	}
 #endif
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 #include <tchar.h>
 
 #if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
-static int IsService(void)
+int OPENSSL_isservice(void)
 { HWINSTA h;
   DWORD len;
   WCHAR *name;
@@ -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;
 
@@ -720,7 +722,7 @@ void OPENSSL_showfatal (const char *fmta,...)
 
 #if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
     /* this -------------v--- guards NT-specific calls */
-    if (GetVersion() < 0x80000000 && IsService())
+    if (GetVersion() < 0x80000000 && OPENSSL_isservice())
     {	HANDLE h = RegisterEventSource(0,_T("OPENSSL"));
 	const TCHAR *pmsg=buf;
 	ReportEvent(h,EVENTLOG_ERROR_TYPE,0,0,0,1,0,&pmsg,0);
@@ -752,6 +754,7 @@ void OPENSSL_showfatal (const char *fmta,...)
     vfprintf (stderr,fmta,ap);
     va_end (ap);
 }
+int OPENSSL_isservice (void) { return 0; }
 #endif
 
 void OpenSSLDie(const char *file,int line,const char *assertion)