diff options
| author | Rémi Verschelde | 2017-05-27 15:35:40 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2017-05-27 15:45:25 +0200 |
| commit | cb0f771aaacf367e5026d783c9316b6acf3b007d (patch) | |
| tree | a5af042bfe5dac5894098449a18d4aa15c51352b /thirdparty/openssl/crypto | |
| parent | 022541d917ab5a96f888a2b33821517fe312b851 (diff) | |
| download | godot-cb0f771aaacf367e5026d783c9316b6acf3b007d.tar.gz godot-cb0f771aaacf367e5026d783c9316b6acf3b007d.tar.zst godot-cb0f771aaacf367e5026d783c9316b6acf3b007d.zip | |
Diffstat (limited to 'thirdparty/openssl/crypto')
| -rw-r--r-- | thirdparty/openssl/crypto/o_str.c | 6 | ||||
| -rw-r--r-- | thirdparty/openssl/crypto/rand/rand_win.c | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/thirdparty/openssl/crypto/o_str.c b/thirdparty/openssl/crypto/o_str.c index c10842300..7e61cde85 100644 --- a/thirdparty/openssl/crypto/o_str.c +++ b/thirdparty/openssl/crypto/o_str.c @@ -64,11 +64,7 @@ #if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \ !defined(OPENSSL_SYSNAME_WIN32) && !defined(OPENSSL_SYSNAME_WINCE) && \ !defined(NETWARE_CLIB) -#ifdef _WIN32 -#include <string.h> -#else -#include <strings.h> -#endif +# include <strings.h> #endif int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n) diff --git a/thirdparty/openssl/crypto/rand/rand_win.c b/thirdparty/openssl/crypto/rand/rand_win.c index da4c935a5..06670ae01 100644 --- a/thirdparty/openssl/crypto/rand/rand_win.c +++ b/thirdparty/openssl/crypto/rand/rand_win.c @@ -118,10 +118,8 @@ # ifndef _WIN32_WINNT # define _WIN32_WINNT 0x0400 # endif -#ifndef UWP_ENABLED # include <wincrypt.h> # include <tlhelp32.h> -#endif /* * Limit the time spent walking through the heap, processes, threads and @@ -163,7 +161,7 @@ typedef struct tagCURSORINFO { # define CURSOR_SHOWING 0x00000001 # endif /* CURSOR_SHOWING */ -# if !defined(OPENSSL_SYS_WINCE) && !defined(UWP_ENABLED) +# if !defined(OPENSSL_SYS_WINCE) typedef BOOL(WINAPI *CRYPTACQUIRECONTEXTW) (HCRYPTPROV *, LPCWSTR, LPCWSTR, DWORD, DWORD); typedef BOOL(WINAPI *CRYPTGENRANDOM) (HCRYPTPROV, DWORD, BYTE *); @@ -198,7 +196,6 @@ typedef NET_API_STATUS(NET_API_FUNCTION *NETFREE) (LPBYTE); # endif /* 1 */ # endif /* !OPENSSL_SYS_WINCE */ -#if !defined(UWP_ENABLED) int RAND_poll(void) { MEMORYSTATUS m; @@ -583,8 +580,6 @@ int RAND_poll(void) return (1); } -#endif // UWP_ENABLED - int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam) { double add_entropy = 0; @@ -687,7 +682,7 @@ static void readtimer(void) static void readscreen(void) { -# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) && !defined(UWP_ENABLED) +# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) HDC hScrDC; /* screen DC */ HBITMAP hBitmap; /* handle for our bitmap */ BITMAP bm; /* bitmap properties */ |