diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-13 14:43:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-13 14:43:30 +0100 |
| commit | a3ee252993e8200c856be3fe664937f9461ee268 (patch) | |
| tree | af68e434545e20c538f896e28b73f2db7d626edd /thirdparty/openssl/patches | |
| parent | c01575b3125ce1828f0cacb3f9f00286136f373c (diff) | |
| parent | e12c89e8c9896b2e5cdd70dbd2d2acb449ff4b94 (diff) | |
Merge pull request #15664 from akien-mga/thirdparty
Bugfix updates to various thirdparty libraries
Diffstat (limited to 'thirdparty/openssl/patches')
| -rw-r--r-- | thirdparty/openssl/patches/uwp_fix.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/thirdparty/openssl/patches/uwp_fix.patch b/thirdparty/openssl/patches/uwp_fix.patch index 54aeb1f80d..89f6790c85 100644 --- a/thirdparty/openssl/patches/uwp_fix.patch +++ b/thirdparty/openssl/patches/uwp_fix.patch @@ -1,5 +1,5 @@ diff --git a/thirdparty/openssl/crypto/rand/rand_win.c b/thirdparty/openssl/crypto/rand/rand_win.c -index 06670ae01..cb4093128 100644 +index b4be3097e..bc2a7d201 100644 --- a/thirdparty/openssl/crypto/rand/rand_win.c +++ b/thirdparty/openssl/crypto/rand/rand_win.c @@ -118,8 +118,10 @@ @@ -22,15 +22,15 @@ index 06670ae01..cb4093128 100644 typedef BOOL(WINAPI *CRYPTACQUIRECONTEXTW) (HCRYPTPROV *, LPCWSTR, LPCWSTR, DWORD, DWORD); typedef BOOL(WINAPI *CRYPTGENRANDOM) (HCRYPTPROV, DWORD, BYTE *); -@@ -196,6 +198,7 @@ typedef NET_API_STATUS(NET_API_FUNCTION *NETFREE) (LPBYTE); - # endif /* 1 */ - # endif /* !OPENSSL_SYS_WINCE */ +@@ -198,6 +200,7 @@ typedef NET_API_STATUS(NET_API_FUNCTION *NETFREE) (LPBYTE); + + #define NOTTOOLONG(start) ((GetTickCount() - (start)) < MAXDELAY) +#if !defined(UWP_ENABLED) // -- GODOT -- int RAND_poll(void) { MEMORYSTATUS m; -@@ -580,6 +583,8 @@ int RAND_poll(void) +@@ -576,6 +579,8 @@ int RAND_poll(void) return (1); } @@ -39,7 +39,7 @@ index 06670ae01..cb4093128 100644 int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam) { double add_entropy = 0; -@@ -682,7 +687,7 @@ static void readtimer(void) +@@ -678,7 +683,7 @@ static void readtimer(void) static void readscreen(void) { |