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

[Fabian Maurer (＠DarkShadow44)]

Signed-off-by: Fabian Maurer

--
  v2: mmdevapi: Don't redefine stream_handle (gcc 4.3)

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

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

[Fabian Maurer]

From: Fabian Maurer

Signed-off-by: Fabian Maurer 
---
 dlls/mmdevapi/client.c           | 2 +-
 dlls/mmdevapi/mmdevapi_private.h | 2 +-
 dlls/mmdevapi/mmdevdrv.h         | 2 --
 dlls/mmdevapi/session.c          | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c
index bd861f8b890..b93595046f9 100644
--- a/dlls/mmdevapi/client.c
+++ b/dlls/mmdevapi/client.c
@@ -28,8 +28,8 @@
 #include <wine/debug.h>
 #include <wine/unixlib.h>

-#include "mmdevdrv.h"
 #include "unixlib.h"
+#include "mmdevdrv.h"

WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);

diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h
index 684d303eefb..889db79c05b 100644
--- a/dlls/mmdevapi/mmdevapi_private.h
+++ b/dlls/mmdevapi/mmdevapi_private.h
@@ -23,8 +23,8 @@
 #include <wine/list.h>
 #include <wine/unixlib.h>

-#include "mmdevdrv.h"
 #include "unixlib.h"
+#include "mmdevdrv.h"

extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
 extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN;
diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h
index 5c26b1b34d8..df21859cbad 100644
--- a/dlls/mmdevapi/mmdevdrv.h
+++ b/dlls/mmdevapi/mmdevdrv.h
@@ -19,8 +19,6 @@

#include <wine/list.h>

-typedef UINT64 stream_handle;
-
 typedef struct audio_client ACImpl;

typedef struct audio_session {
diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c
index e0625b59993..6762dad255e 100644
--- a/dlls/mmdevapi/session.c
+++ b/dlls/mmdevapi/session.c
@@ -28,8 +28,8 @@
 #include <wine/debug.h>
 #include <wine/unixlib.h>

-#include "mmdevdrv.h"
 #include "unixlib.h"
+#include "mmdevdrv.h"

#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)

[Fabian Maurer (＠DarkShadow44)]

On Wed Jun 14 18:58:35 2023 +0000, Huw Davies wrote:
> 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`.

Alright, thanks!

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

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.

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

[Davide Beatrici (＠davidebeatrici)]

This merge request was approved by Davide Beatrici.