Module: wine Branch: master Commit: a58ec769890883bb7cb15c916a3f6dee76f8b8c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a58ec769890883bb7cb15c916a3f6de...
Author: Fabian Maurer dark.shadow4@web.de Date: Tue Jun 13 21:31:02 2023 +0200
mmdevapi: Don't redefine stream_handle (gcc 4.3).
Signed-off-by: Fabian Maurer dark.shadow4@web.de
---
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 b1b178e00a5..8eb6d6867dc 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 5abde115951..1cd8412b6ea 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)
-
Alexandre Julliard