summaryrefslogtreecommitdiff
path: root/thirdparty
diff options
context:
space:
mode:
Diffstat (limited to 'thirdparty')
-rw-r--r--thirdparty/README.md2
-rw-r--r--thirdparty/enet/win32.c6
-rw-r--r--thirdparty/openssl/crypto/rand/rand_win.c10
-rw-r--r--thirdparty/openssl/openssl/dtls1.h2
-rw-r--r--thirdparty/openssl/uwp.cpp (renamed from thirdparty/openssl/winrt.cpp)8
-rw-r--r--thirdparty/openssl/uwp_fix.patch (renamed from thirdparty/openssl/winrt_fix.patch)12
-rw-r--r--thirdparty/rtaudio/RtAudio.h2
7 files changed, 21 insertions, 21 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md
index a1445a7a9a..3adbbea59b 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -14,7 +14,7 @@ Files extracted from upstream source:
- LICENSE file
Important: Some files have been modified by Godot developers so that they work
-for all platforms (especially WinRT). Check the diff with the 1.3.13 tarball
+for all platforms (especially UWP). Check the diff with the 1.3.13 tarball
before the next update.
diff --git a/thirdparty/enet/win32.c b/thirdparty/enet/win32.c
index 15edd7acbb..f8e0d4efd4 100644
--- a/thirdparty/enet/win32.c
+++ b/thirdparty/enet/win32.c
@@ -28,7 +28,7 @@ enet_initialize (void)
return -1;
}
-#ifndef WINRT_ENABLED
+#ifndef UWP_ENABLED
timeBeginPeriod (1);
#endif
@@ -38,14 +38,14 @@ enet_initialize (void)
void
enet_deinitialize (void)
{
-#ifndef WINRT_ENABLED
+#ifndef UWP_ENABLED
timeEndPeriod (1);
#endif
WSACleanup ();
}
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
enet_uint32
timeGetTime() {
ULONGLONG ticks = GetTickCount64();
diff --git a/thirdparty/openssl/crypto/rand/rand_win.c b/thirdparty/openssl/crypto/rand/rand_win.c
index 70fd52a7aa..da4c935a53 100644
--- a/thirdparty/openssl/crypto/rand/rand_win.c
+++ b/thirdparty/openssl/crypto/rand/rand_win.c
@@ -118,7 +118,7 @@
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0400
# endif
-#ifndef WINRT_ENABLED
+#ifndef UWP_ENABLED
# include <wincrypt.h>
# include <tlhelp32.h>
#endif
@@ -163,7 +163,7 @@ typedef struct tagCURSORINFO {
# define CURSOR_SHOWING 0x00000001
# endif /* CURSOR_SHOWING */
-# if !defined(OPENSSL_SYS_WINCE) && !defined(WINRT_ENABLED)
+# if !defined(OPENSSL_SYS_WINCE) && !defined(UWP_ENABLED)
typedef BOOL(WINAPI *CRYPTACQUIRECONTEXTW) (HCRYPTPROV *, LPCWSTR, LPCWSTR,
DWORD, DWORD);
typedef BOOL(WINAPI *CRYPTGENRANDOM) (HCRYPTPROV, DWORD, BYTE *);
@@ -198,7 +198,7 @@ typedef NET_API_STATUS(NET_API_FUNCTION *NETFREE) (LPBYTE);
# endif /* 1 */
# endif /* !OPENSSL_SYS_WINCE */
-#if !defined(WINRT_ENABLED)
+#if !defined(UWP_ENABLED)
int RAND_poll(void)
{
MEMORYSTATUS m;
@@ -583,7 +583,7 @@ int RAND_poll(void)
return (1);
}
-#endif // WINRT_ENABLED
+#endif // UWP_ENABLED
int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam)
{
@@ -687,7 +687,7 @@ static void readtimer(void)
static void readscreen(void)
{
-# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) && !defined(WINRT_ENABLED)
+# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) && !defined(UWP_ENABLED)
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 a58aca248d..cdd1e4d86e 100644
--- a/thirdparty/openssl/openssl/dtls1.h
+++ b/thirdparty/openssl/openssl/dtls1.h
@@ -81,7 +81,7 @@
# include <sys/time.h>
# endif
# endif
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
#include <winsock2.h>
#endif
diff --git a/thirdparty/openssl/winrt.cpp b/thirdparty/openssl/uwp.cpp
index c3a6f8bfcc..dcfd22b77f 100644
--- a/thirdparty/openssl/winrt.cpp
+++ b/thirdparty/openssl/uwp.cpp
@@ -1,7 +1,7 @@
/* Snippets extracted from https://github.com/Microsoft/openssl/blob/ec7e430e06e4e3ac87c183dee33cb216814cf980/ms/winrt.cpp
* Adapted for Godot definitions
*/
-/* winrt.cpp
+/* uwp.cpp
* Copyright 2014 Microsoft Corporation
* C++/CX Entropy/shims for Windows Phone/Windows Store platform
* written by Alejandro Jimenez Martinez
@@ -44,7 +44,7 @@ int RAND_poll(void)
return 1;
}
-#if defined(WINRT_ENABLED)
+#if defined(UWP_ENABLED)
extern "C"
{
#include<stdio.h>
@@ -144,7 +144,7 @@ extern "C"
{
return 0;
}
- int winrt_GetTickCount(void)
+ int uwp_GetTickCount(void)
{
LARGE_INTEGER t;
return(int) (QueryPerformanceCounter(&t) ? t.QuadPart : 0);
@@ -152,4 +152,4 @@ extern "C"
void *OPENSSL_UplinkTable [26]= {0};
} //extern C
-#endif /*defined(WINRT_ENABLED)*/
+#endif /*defined(UWP_ENABLED)*/
diff --git a/thirdparty/openssl/winrt_fix.patch b/thirdparty/openssl/uwp_fix.patch
index caf180a75b..00d8b64d00 100644
--- a/thirdparty/openssl/winrt_fix.patch
+++ b/thirdparty/openssl/uwp_fix.patch
@@ -6,7 +6,7 @@ index 06670ae..70fd52a 100644
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0400
# endif
-+#ifndef WINRT_ENABLED
++#ifndef UWP_ENABLED
# include <wincrypt.h>
# include <tlhelp32.h>
+#endif
@@ -18,7 +18,7 @@ index 06670ae..70fd52a 100644
# endif /* CURSOR_SHOWING */
-# if !defined(OPENSSL_SYS_WINCE)
-+# if !defined(OPENSSL_SYS_WINCE) && !defined(WINRT_ENABLED)
++# if !defined(OPENSSL_SYS_WINCE) && !defined(UWP_ENABLED)
typedef BOOL(WINAPI *CRYPTACQUIRECONTEXTW) (HCRYPTPROV *, LPCWSTR, LPCWSTR,
DWORD, DWORD);
typedef BOOL(WINAPI *CRYPTGENRANDOM) (HCRYPTPROV, DWORD, BYTE *);
@@ -26,7 +26,7 @@ index 06670ae..70fd52a 100644
# endif /* 1 */
# endif /* !OPENSSL_SYS_WINCE */
-+#if !defined(WINRT_ENABLED)
++#if !defined(UWP_ENABLED)
int RAND_poll(void)
{
MEMORYSTATUS m;
@@ -34,7 +34,7 @@ index 06670ae..70fd52a 100644
return (1);
}
-+#endif // WINRT_ENABLED
++#endif // UWP_ENABLED
+
int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam)
{
@@ -44,7 +44,7 @@ index 06670ae..70fd52a 100644
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)
++# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) && !defined(UWP_ENABLED)
HDC hScrDC; /* screen DC */
HBITMAP hBitmap; /* handle for our bitmap */
BITMAP bm; /* bitmap properties */
@@ -56,7 +56,7 @@ index 64ad3c8..a58aca2 100644
# include <sys/time.h>
# endif
# endif
-+#ifdef WINRT_ENABLED
++#ifdef UWP_ENABLED
+#include <winsock2.h>
+#endif
diff --git a/thirdparty/rtaudio/RtAudio.h b/thirdparty/rtaudio/RtAudio.h
index 4392e95f32..aab109d907 100644
--- a/thirdparty/rtaudio/RtAudio.h
+++ b/thirdparty/rtaudio/RtAudio.h
@@ -7,7 +7,7 @@
#elif defined(UNIX_ENABLED)
#define __LINUX_ALSA__
#elif defined(WINDOWS_ENABLED)
- #if defined(WINRT_ENABLED)
+ #if defined(UWP_ENABLED)
#define __RTAUDIO_DUMMY__
#else
#define __WINDOWS_DS__
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 06:41:24 +0000