[vlc-devel] [PATCH 3/3] contrib: asdcplib: simplify the WIN32 detection in autotools

[Steve Lhomme]

---
 .../asdcplib/win32-cross-compilation.patch    | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/contrib/src/asdcplib/win32-cross-compilation.patch b/contrib/src/asdcplib/win32-cross-compilation.patch
index 8bf39a2a318..73d67d56291 100644
--- a/contrib/src/asdcplib/win32-cross-compilation.patch
+++ b/contrib/src/asdcplib/win32-cross-compilation.patch
@@ -1,12 +1,30 @@
---- asdcplib/configure.ac	2014-01-06 20:08:54.000000000 +0100
-+++ asdcplib/configure.ac.new	2014-05-16 13:05:45.689691678 +0200
-@@ -49,6 +49,9 @@
- AC_CANONICAL_HOST
- case $host_os in
+From 5f64cfdf89b31b4bfe61694222e91cf48a6919ca Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Thu, 26 Mar 2020 09:22:07 +0100
+Subject: [PATCH 3/3] enable KM_WIN32 for win32 autotools compilation
+
+Although it should not be needed and _WIN32 should be used in the code instead.
+
+Co-Authored-By: Jean-Baptiste Kempf <jb at videolan.org>
+---
+ configure.ac | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 102d96d..5596cd8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,10 @@ case $host_os in
         openbsd*) openbsd_host=true ;;
-+       cygwin* | mingw32*)
-+            openbsd_host=false
-+            CPPFLAGS="${CPPFLAGS} -DKM_WIN32" ;;
         *)        openbsd_host=false ;;
  esac
++case $host_os in
++       cygwin* | mingw32*)
++           CPPFLAGS="${CPPFLAGS} -DKM_WIN32" ;;
++esac
  AM_CONDITIONAL([OPENBSD_HOST], [test x$openbsd_host = xtrue])
+ AC_PROG_CC
+ AC_PROG_CXX
+-- 
+2.26.0.windows.1
+
-- 
2.17.1