summaryrefslogtreecommitdiff
path: root/patches/0004-fix-uwp.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/0004-fix-uwp.patch')
-rw-r--r--patches/0004-fix-uwp.patch13
1 files changed, 9 insertions, 4 deletions
diff --git a/patches/0004-fix-uwp.patch b/patches/0004-fix-uwp.patch
index 23145a7..edef10a 100644
--- a/patches/0004-fix-uwp.patch
+++ b/patches/0004-fix-uwp.patch
@@ -1,14 +1,19 @@
diff --git a/third_party/zlib/contrib/minizip/iowin32.c b/third_party/zlib/contrib/minizip/iowin32.c
-index 246ceb91a139..c6bc314b3c28 100644
+index bbd7773e67146..3f6867fd7e40b 100644
--- a/third_party/zlib/contrib/minizip/iowin32.c
+++ b/third_party/zlib/contrib/minizip/iowin32.c
-@@ -31,14 +31,12 @@
+@@ -30,19 +30,12 @@
#define _WIN32_WINNT 0x601
#endif
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
-// see Include/shared/winapifamily.h in the Windows Kit
-#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
+-
+-#if !defined(WINAPI_FAMILY_ONE_PARTITION)
+-#define WINAPI_FAMILY_ONE_PARTITION(PartitionSet, Partition) ((WINAPI_FAMILY & PartitionSet) == Partition)
+-#endif
+-
-#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
+#if !defined(IOWIN32_USING_WINRT_API)
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
@@ -18,5 +23,5 @@ index 246ceb91a139..c6bc314b3c28 100644
#endif
-#endif
- voidpf ZCALLBACK win32_open_file_func OF((voidpf opaque, const char* filename, int mode));
- uLong ZCALLBACK win32_read_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+ typedef struct
+ {