diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-06 12:03:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-06 12:03:10 +0100 |
| commit | be4eff1d8b0b87f81be56d8cf166bcc209205638 (patch) | |
| tree | 437a4c3495753de1528653a82a5bd094193061e7 /thirdparty/openssl/crypto | |
| parent | 20a33e809e5968f915021d162db955e207c8e7b7 (diff) | |
| parent | 411faaa6f478f837aa40893eaadf67e2b5d57cec (diff) | |
Merge pull request #7019 from vnen/rename-winrt-uwp
Rename WinRT platform to UWP
Diffstat (limited to 'thirdparty/openssl/crypto')
| -rw-r--r-- | thirdparty/openssl/crypto/rand/rand_win.c | 10 |
1 files changed, 5 insertions, 5 deletions
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 */ |