From fb5a73a39fb7e6e5924db362062cba628525028a Mon Sep 17 00:00:00 2001
From: George Marques <george@gmarqu.es>
Date: Wed, 2 Nov 2016 18:26:42 -0200
Subject: Rename WinRT files to UWP

---
 thirdparty/openssl/uwp_fix.patch | 64 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 thirdparty/openssl/uwp_fix.patch

(limited to 'thirdparty/openssl/uwp_fix.patch')

diff --git a/thirdparty/openssl/uwp_fix.patch b/thirdparty/openssl/uwp_fix.patch
new file mode 100644
index 0000000000..caf180a75b
--- /dev/null
+++ b/thirdparty/openssl/uwp_fix.patch
@@ -0,0 +1,64 @@
+diff --git a/drivers/builtin_openssl2/crypto/rand/rand_win.c b/drivers/builtin_openssl2/crypto/rand/rand_win.c
+index 06670ae..70fd52a 100644
+--- a/drivers/builtin_openssl2/crypto/rand/rand_win.c
++++ b/drivers/builtin_openssl2/crypto/rand/rand_win.c
+@@ -118,8 +118,10 @@
+ # ifndef _WIN32_WINNT
+ #  define _WIN32_WINNT 0x0400
+ # endif
++#ifndef WINRT_ENABLED
+ # include <wincrypt.h>
+ # include <tlhelp32.h>
++#endif
+ 
+ /*
+  * 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)
+ 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 */
+ 
++#if !defined(WINRT_ENABLED)
+ int RAND_poll(void)
+ {
+     MEMORYSTATUS m;
+@@ -580,6 +583,8 @@ int RAND_poll(void)
+     return (1);
+ }
+ 
++#endif // WINRT_ENABLED
++
+ int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam)
+ {
+     double add_entropy = 0;
+@@ -682,7 +687,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)
+     HDC hScrDC;                 /* screen DC */
+     HBITMAP hBitmap;            /* handle for our bitmap */
+     BITMAP bm;                  /* bitmap properties */
+diff --git a/drivers/builtin_openssl2/openssl/dtls1.h b/drivers/builtin_openssl2/openssl/dtls1.h
+index 64ad3c8..a58aca2 100644
+--- a/drivers/builtin_openssl2/openssl/dtls1.h
++++ b/drivers/builtin_openssl2/openssl/dtls1.h
+@@ -81,6 +81,9 @@
+ #   include <sys/time.h>
+ #  endif
+ # endif
++#ifdef WINRT_ENABLED
++#include <winsock2.h>
++#endif
+ 
+ #ifdef  __cplusplus
+ extern "C" {
-- 
cgit v1.2.3


From b113c7b7a3e63581ae268b0ae7f827d55e381b82 Mon Sep 17 00:00:00 2001
From: George Marques <george@gmarqu.es>
Date: Wed, 2 Nov 2016 18:57:35 -0200
Subject: Rename WINRT_ENABLED to UWP_ENABLED

---
 thirdparty/openssl/uwp_fix.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'thirdparty/openssl/uwp_fix.patch')

diff --git a/thirdparty/openssl/uwp_fix.patch b/thirdparty/openssl/uwp_fix.patch
index caf180a75b..00d8b64d00 100644
--- a/thirdparty/openssl/uwp_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
  
-- 
cgit v1.2.3