65 lines
2.2 KiB
Diff
65 lines
2.2 KiB
Diff
diff --git a/thirdparty/openssl/crypto/rand/rand_win.c b/thirdparty/openssl/crypto/rand/rand_win.c
|
|
index b4be3097e9..63a9e9975a 100644
|
|
--- a/thirdparty/openssl/crypto/rand/rand_win.c
|
|
+++ b/thirdparty/openssl/crypto/rand/rand_win.c
|
|
@@ -118,8 +118,10 @@
|
|
# ifndef _WIN32_WINNT
|
|
# define _WIN32_WINNT 0x0400
|
|
# endif
|
|
+#ifndef WINRT_ENABLED // -- GODOT --
|
|
# include <wincrypt.h>
|
|
# include <tlhelp32.h>
|
|
+#endif // -- GODOT --
|
|
|
|
/*
|
|
* Limit the time spent walking through the heap, processes, threads and
|
|
@@ -161,7 +163,7 @@ typedef struct tagCURSORINFO {
|
|
# define CURSOR_SHOWING 0x00000001
|
|
# endif /* CURSOR_SHOWING */
|
|
|
|
-# if !defined(OPENSSL_SYS_WINCE)
|
|
+# if !defined(OPENSSL_SYS_WINCE) && !defined(WINRT_ENABLED) // -- GODOT --
|
|
typedef BOOL(WINAPI *CRYPTACQUIRECONTEXTW) (HCRYPTPROV *, LPCWSTR, LPCWSTR,
|
|
DWORD, DWORD);
|
|
typedef BOOL(WINAPI *CRYPTGENRANDOM) (HCRYPTPROV, DWORD, BYTE *);
|
|
@@ -198,6 +200,7 @@ typedef NET_API_STATUS(NET_API_FUNCTION *NETFREE) (LPBYTE);
|
|
|
|
#define NOTTOOLONG(start) ((GetTickCount() - (start)) < MAXDELAY)
|
|
|
|
+#if !defined(WINRT_ENABLED) // -- GODOT --
|
|
int RAND_poll(void)
|
|
{
|
|
MEMORYSTATUS m;
|
|
@@ -576,6 +579,8 @@ int RAND_poll(void)
|
|
return (1);
|
|
}
|
|
|
|
+#endif // WINRT_ENABLED // -- GODOT --
|
|
+
|
|
int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam)
|
|
{
|
|
double add_entropy = 0;
|
|
@@ -678,7 +683,7 @@ static void readtimer(void)
|
|
|
|
static void readscreen(void)
|
|
{
|
|
-# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN)
|
|
+# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) && !defined(WINRT_ENABLED) // -- GODOT --
|
|
HDC hScrDC; /* screen DC */
|
|
HBITMAP hBitmap; /* handle for our bitmap */
|
|
BITMAP bm; /* bitmap properties */
|
|
diff --git a/thirdparty/openssl/openssl/dtls1.h b/thirdparty/openssl/openssl/dtls1.h
|
|
index 30bbcf278a..31cb6d7eb9 100644
|
|
--- a/thirdparty/openssl/openssl/dtls1.h
|
|
+++ b/thirdparty/openssl/openssl/dtls1.h
|
|
@@ -78,6 +78,9 @@
|
|
# include <sys/time.h>
|
|
# endif
|
|
# endif
|
|
+#ifdef WINRT_ENABLED // -- GODOT start --
|
|
+#include <winsock2.h>
|
|
+#endif // -- GODOT end --
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|