From a3387a9e22285abb179b3ce8c7f52052948c2600 Mon Sep 17 00:00:00 2001
From: George Marques <george@gmarqu.es>
Date: Thu, 9 Nov 2017 16:06:44 -0200
Subject: [PATCH] UWP: Update to build with Windows SDK 10.16229.0

- Update the OpenSSL shim to work with the new SDK
- Change the ARM platform detection to work with VS2017
---
 platform/uwp/detect.py     | 2 +-
 thirdparty/openssl/uwp.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py
index af53f974462..434c5974497 100644
--- a/platform/uwp/detect.py
+++ b/platform/uwp/detect.py
@@ -84,7 +84,7 @@ def configure(env):
     ## Architecture
 
     arch = ""
-    if os.getenv('Platform') == "ARM":
+    if str(os.getenv('Platform')).lower() == "arm":
 
         print("Compiled program architecture will be an ARM executable. (forcing bits=32).")
 
diff --git a/thirdparty/openssl/uwp.cpp b/thirdparty/openssl/uwp.cpp
index dcfd22b77f0..e00c9d59dbb 100644
--- a/thirdparty/openssl/uwp.cpp
+++ b/thirdparty/openssl/uwp.cpp
@@ -103,12 +103,14 @@ extern "C"
 		{
 		return 0;
 		}
+#ifndef STD_ERROR_HANDLE
 	int __cdecl GetStdHandle(
 						   _In_  DWORD nStdHandle
 						   )
 		{
 		return 0;
 		}
+#endif
 	BOOL DeregisterEventSource(
 							  _Inout_  HANDLE hEventLog
 							  )