diff options
| author | Andy Polyakov <appro@openssl.org> | 2015-09-28 16:00:08 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2015-09-29 18:05:40 +0200 |
| commit | 156561b0ade98b22df0e3ebc63682e54129c2cb4 (patch) | |
| tree | 82e74e7ae87b15286228edeb711d0826a97704e8 /crypto/cryptlib.c | |
| parent | 16a9542a1723828c5b2dbe854a2864aa3ed2b11e (diff) | |
| download | openssl-156561b0ade98b22df0e3ebc63682e54129c2cb4.tar.gz | |
Fix pedantic warnings in mingw builds.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/cryptlib.c')
| -rw-r--r-- | crypto/cryptlib.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 39d1e1ea84..f0aaae6893 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -117,10 +117,6 @@ #include "internal/cryptlib.h" #include <openssl/safestack.h> -#if defined(OPENSSL_SYS_WIN32) -static double SSLeay_MSVC5_hack = 0.0; /* and for VC1.5 */ -#endif - #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__INTEL__) || \ defined(__x86_64) || defined(__x86_64__) || \ @@ -268,15 +264,15 @@ int OPENSSL_isservice(void) WCHAR *name; static union { void *p; - int (*f) (void); + FARPROC f; } _OPENSSL_isservice = { NULL }; if (_OPENSSL_isservice.p == NULL) { - HANDLE h = GetModuleHandle(NULL); - if (h != NULL) - _OPENSSL_isservice.p = GetProcAddress(h, "_OPENSSL_isservice"); + HANDLE mod = GetModuleHandle(NULL); + if (mod != NULL) + _OPENSSL_isservice.f = GetProcAddress(mod, "_OPENSSL_isservice"); if (_OPENSSL_isservice.p == NULL) _OPENSSL_isservice.p = (void *)-1; } |