[vlc-commits] contrib: harfbuzz: fix WINAPI detection

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Apr  7 08:51:20 2021 +0200| [4e013b27c927a6794a0e348e7c75fa965e49631d] | committer: Steve Lhomme

contrib: harfbuzz: fix WINAPI detection

The safe way to detect a UWP or Desktop app with mingw64 is to check the
WINAPI_PARTITION_DESKTOP partition.

(cherry picked from commit e5b1962306d7bf39521a30454ea8058d463b8d61)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=4e013b27c927a6794a0e348e7c75fa965e49631d
---

 contrib/src/harfbuzz/0003-Fix-winstore-app-detection-with-mingw64.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/harfbuzz/0003-Fix-winstore-app-detection-with-mingw64.patch b/contrib/src/harfbuzz/0003-Fix-winstore-app-detection-with-mingw64.patch
index 3550dd0072..a69ca71cd4 100644
--- a/contrib/src/harfbuzz/0003-Fix-winstore-app-detection-with-mingw64.patch
+++ b/contrib/src/harfbuzz/0003-Fix-winstore-app-detection-with-mingw64.patch
@@ -51,7 +51,7 @@ index e7f8b1c4..f48d6b29 100644
  typedef CRITICAL_SECTION hb_mutex_impl_t;
  #define HB_MUTEX_IMPL_INIT	{0}
 -#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
++#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
  #define hb_mutex_impl_init(M)	InitializeCriticalSectionEx (M, 0, 0)
  #else
  #define hb_mutex_impl_init(M)	InitializeCriticalSection (M)