[PATCH 0/2] MR3061: libs/jxr: Compile with ansi flag to avoid typedef redefinitions (gcc 4.3)

[Fabian Maurer (＠DarkShadow44)]

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3061

[PATCH 1/2] libs/jxr: Compile with ansi flag to avoid typedef redefinitions (gcc 4.3)

[Fabian Maurer]

From: Fabian Maurer <dark.shadow4(a)web.de>

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 libs/jxr/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/jxr/Makefile.in b/libs/jxr/Makefile.in
index 3162cfca263..ed8d80a5717 100644
--- a/libs/jxr/Makefile.in
+++ b/libs/jxr/Makefile.in
@@ -1,6 +1,6 @@
 EXTLIB    = libjxr.a
 EXTRAINCL = $(JXR_PE_CFLAGS)
-EXTRADEFS = -DDISABLE_PERF_MEASUREMENT
+EXTRADEFS = -DDISABLE_PERF_MEASUREMENT -D__ANSI__
 
 C_SRCS = \
 	image/decode/JXRTranscode.c \
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/3061

[PATCH 2/2] wmphoto: Define ansi flag for JXRGlue to avoid typedef redefinitions (gcc 4.3)

[Fabian Maurer]

From: Fabian Maurer <dark.shadow4(a)web.de>

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 dlls/wmphoto/jxrlib.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/wmphoto/jxrlib.c b/dlls/wmphoto/jxrlib.c
index d4ac02e5918..e5b1bc99dcf 100644
--- a/dlls/wmphoto/jxrlib.c
+++ b/dlls/wmphoto/jxrlib.c
@@ -28,7 +28,9 @@
 #include "winbase.h"
 #include "objbase.h"
 #define ERR JXR_ERR
+#define __ANSI__
 #include "JXRGlue.h"
+#undef __ANSI__
 #undef ERR
 
 #include "wincodecs_private.h"
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3061

[PATCH 0/2] MR3061: libs/jxr: Compile with ansi flag to avoid typedef redefinitions (gcc 4.3) - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3061