From fac0ba449de0adade6c2f8f26f1fca2b1329a8d2 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbap...@gmail.com>
Date: Tue, 29 Aug 2023 20:43:47 +0530
Subject: [PATCH 2/2] headers: Fix redefinition of TIMECODE_SAMPLE in strmif.idl
This fixes the following compiler error.
strmif.h:12304:18: error: redefinition of 'struct tagTIMECODE_SAMPLE'
12304 | typedef struct tagTIMECODE_SAMPLE {
| ^~~~~~~~~~~~~~~~~~
ksmedia.h:3851:16: note: previous definition of 'struct tagTIMECODE_SAMPLE'
3851 | typedef struct tagTIMECODE_SAMPLE {
| ^~~~~~~~~~~~~~~~~~
Signed-off-by: Biswapriyo Nath <nathbap...@gmail.com>
---
mingw-w64-headers/include/strmif.idl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mingw-w64-headers/include/strmif.idl
b/mingw-w64-headers/include/strmif.idl
index 0e250d1..260f3f9 100644
--- a/mingw-w64-headers/include/strmif.idl
+++ b/mingw-w64-headers/include/strmif.idl
@@ -1269,7 +1269,6 @@ cpp_quote(" DWORD dwFrames;")
cpp_quote(" };")
cpp_quote(" DWORDLONG qw;")
cpp_quote(" } TIMECODE;")
-cpp_quote("#endif")
cpp_quote("")
cpp_quote(" typedef TIMECODE *PTIMECODE;")
cpp_quote("")
@@ -1281,6 +1280,7 @@ cpp_quote(" DWORD dwFlags;")
cpp_quote(" } TIMECODE_SAMPLE;")
cpp_quote("")
cpp_quote(" typedef TIMECODE_SAMPLE *PTIMECODE_SAMPLE;")
+cpp_quote("#endif /* TIMECODE_DEFINED */")
cpp_quote("")
cpp_quote(" extern RPC_IF_HANDLE __MIDL_itf_strmif_0340_v0_0_c_ifspec;")
cpp_quote(" extern RPC_IF_HANDLE __MIDL_itf_strmif_0340_v0_0_s_ifspec;")
--
2.42.0
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
