[PATCH 0/1] MR3060: mmdevapi: Don't redefine stream_handle (gcc 4.3)

[Fabian Maurer (＠DarkShadow44)]

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

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

[PATCH 1/1] mmdevapi: Don't redefine stream_handle (gcc 4.3)

[Fabian Maurer]

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

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 dlls/mmdevapi/mmdevdrv.h | 3 +++
 dlls/mmdevapi/unixlib.h  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h
index 5c26b1b34d8..d54da7c18a0 100644
--- a/dlls/mmdevapi/mmdevdrv.h
+++ b/dlls/mmdevapi/mmdevdrv.h
@@ -19,7 +19,10 @@
 
 #include <wine/list.h>
 
+#ifndef HAVE_STREAM_HANDLE
+#define HAVE_STREAM_HANDLE
 typedef UINT64 stream_handle;
+#endif
 
 typedef struct audio_client ACImpl;
 
diff --git a/dlls/mmdevapi/unixlib.h b/dlls/mmdevapi/unixlib.h
index b1e025a512b..1b5c608879e 100644
--- a/dlls/mmdevapi/unixlib.h
+++ b/dlls/mmdevapi/unixlib.h
@@ -20,7 +20,10 @@
 #include "audioclient.h"
 #include "mmdeviceapi.h"
 
+#ifndef HAVE_STREAM_HANDLE
+#define HAVE_STREAM_HANDLE
 typedef UINT64 stream_handle;
+#endif
 
 enum driver_priority
 {
-- 
GitLab

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

[Huw Davies (＠huw)]

Looks like the correct fix is to remove the `stream_handle` typedef from `mmdevdrv.h` and then make sure that `unixlib.h` is included before `mmdevdrv.h` in `client.c`, `mmdevapi_private.h` and `session.c`.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3060#note_35691