From 9604a7245070a9b35016e5ce20d646afac9ccd35 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <[email protected]>
Date: Tue, 29 Aug 2023 20:32:08 +0530
Subject: [PATCH 1/2] headers: Fix redefinition of DDPIXELFORMAT in ksmedia.h
This fixes the following compiler error.
ddraw.h:773:16: error: redefinition of 'struct _DDPIXELFORMAT'
773 | typedef struct _DDPIXELFORMAT {
| ^~~~~~~~~~~~~~
ksmedia.h:4262:16: note: previous definition of 'struct _DDPIXELFORMAT'
4262 | typedef struct _DDPIXELFORMAT
| ^~~~~~~~~~~~~~
Signed-off-by: Biswapriyo Nath <[email protected]>
---
mingw-w64-headers/include/ksmedia.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/mingw-w64-headers/include/ksmedia.h
b/mingw-w64-headers/include/ksmedia.h
index 2ed9f78..c3f98a5 100644
--- a/mingw-w64-headers/include/ksmedia.h
+++ b/mingw-w64-headers/include/ksmedia.h
@@ -4257,6 +4257,8 @@ typedef struct {
#ifndef __DDRAW_INCLUDED__
#define DDPF_FOURCC __MSABI_LONG(0x00000004)
+#ifndef _DDPIXELFORMAT_DEFINED
+#define _DDPIXELFORMAT_DEFINED
typedef struct _DDPIXELFORMAT
{
DWORD dwSize;
@@ -4292,6 +4294,8 @@ typedef struct _DDPIXELFORMAT
DWORD dwYUVZBitMask;
};
} DDPIXELFORMAT,*LPDDPIXELFORMAT;
+#endif /* _DDPIXELFORMAT_DEFINED */
+
#endif /* __DDRAW_INCLUDED__ */
#ifndef __DVP_INCLUDED__
--
2.42.0
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
