[OMPT-svn-commit] OpenMPT r20168 - in branches/OpenMPT-1.30: . include/zlib/contrib/minizip

[<sv...@op...>]

Author: manx
Date: Sat Mar  2 20:38:55 2024
New Revision: 20168
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20168

Log:
Merged revision(s) 20164 from trunk/OpenMPT:
[Fix] zlib: Fix minor mis-merge of zlib 1.3.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/include/zlib/contrib/minizip/iowin32.c

Modified: branches/OpenMPT-1.30/include/zlib/contrib/minizip/iowin32.c
==============================================================================
--- branches/OpenMPT-1.30/include/zlib/contrib/minizip/iowin32.c	Sat Mar  2 20:38:33 2024	(r20167)
+++ branches/OpenMPT-1.30/include/zlib/contrib/minizip/iowin32.c	Sat Mar  2 20:38:55 2024	(r20168)
@@ -28,12 +28,12 @@
 
 #if (_WIN32_WINNT >= 0x0602) // OpenMPT
 // 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 defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
 #if 1 // OpenMPT
 #if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) // OpenMPT
 #define IOWIN32_USING_WINRT_API 1 // OpenMPT