diff options
| author | Dale Stammen <dalestam@microsoft.com> | 2018-05-31 10:04:01 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-05-31 10:04:01 -0700 |
| commit | 8770a014ece92b6cdc800b5788d4885a0065b5e8 (patch) | |
| tree | 579e0cc9f7af866e5307f4767dee985e564783e6 /ports/openssl/fix-uwp-rs4.patch | |
| parent | 33ba0669661bfededfb14bdc0399f638076e5b59 (diff) | |
| download | vcpkg-8770a014ece92b6cdc800b5788d4885a0065b5e8.tar.gz vcpkg-8770a014ece92b6cdc800b5788d4885a0065b5e8.zip | |
fixed UWP builds with RS4 SDK (#3348)
* fixed uwp builds with RS4 sdk
* fixed check for RS4
* [openssl] Revert line ending conversion
Diffstat (limited to 'ports/openssl/fix-uwp-rs4.patch')
| -rw-r--r-- | ports/openssl/fix-uwp-rs4.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/ports/openssl/fix-uwp-rs4.patch b/ports/openssl/fix-uwp-rs4.patch new file mode 100644 index 000000000..d5a33909e --- /dev/null +++ b/ports/openssl/fix-uwp-rs4.patch @@ -0,0 +1,26 @@ +diff --git a/ms/winrtdef.h b/ms/winrtdef.h
+index b1a7598..6ba2e1d 100644
+--- a/ms/winrtdef.h
++++ b/ms/winrtdef.h
+@@ -6,9 +6,11 @@
+ #if defined(OPENSSL_WINAPP)
+ //Include stdio.h to replace fprintf
+ # include<stdio.h>
++#if !defined(NTDDI_VERSION) || (NTDDI_VERSION < NTDDI_WIN10_RS4)
+ # ifdef getenv
+ # undef getenv
+ # endif
++#endif
+ # ifdef setenv
+ # undef setenv
+ # endif
+@@ -32,7 +34,9 @@
+ # undef GetModuleHandle
+ # define GetModuleHandle winrt_GetModuleHandle
+ # endif
++#if !defined(NTDDI_WIN10_RS4) || (NTDDI_VERSION < NTDDI_WIN10_RS4)
+ # define getenv winrt_getenv
++#endif
+ # define setenv winrt_getenv
+
+ int winrt_GetTickCount(void);
|