[PATCH 0/1] MR11216: include: Move ifdef __cplusplus in rpcasync.h

[Daniel Lehman (＠dlehman25)]

error with gcc 14.3:

In file included from /wine/include/wine/windows/rpc.h:59,
                 from /wine/include/wine/windows/windows.h:60,
                 from StdAfx.h:33,
                 from mainwin.cpp:17:
/wine/include/wine/windows/rpcasync.h:139:7: error: declaration of '_RPC_ASYNC_NOTIFICATION_INFO::<unnamed struct> _RPC_ASYNC_NOTIFICATION_INFO::HWND' changes mean
  139 |     } HWND;
      |       ^~~~
/wine/include/wine/windows/rpcasync.h:137:9: note: used here to mean 'typedef struct HWND__* HWND'
  137 |         HWND hWnd;
      |         ^~~~
In file included from /wine/include/wine/windows/minwindef.h:258,
                 from /wine/include/wine/windows/windef.h:24,
                 from /wine/include/wine/windows/windows.h:38:
/wine/include/wine/windows/windef.h:59:16: note: declared here
   59 | DECLARE_HANDLE(HWND);
      |                ^~~~

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

[PATCH 1/1] include: Move ifdef __cplusplus in rpcasync.h

[Daniel Lehman]

From: Daniel Lehman <[e-mail]>

error with gcc 14.3:

In file included from /wine/include/wine/windows/rpc.h:59,
                 from /wine/include/wine/windows/windows.h:60,
                 from StdAfx.h:33,
                 from mainwin.cpp:17:
/wine/include/wine/windows/rpcasync.h:139:7: error: declaration of '_RPC_ASYNC_NOTIFICATION_INFO::<unnamed struct> _RPC_ASYNC_NOTIFICATION_INFO::HWND' changes mean
  139 |     } HWND;
      |       ^~~~
/wine/include/wine/windows/rpcasync.h:137:9: note: used here to mean 'typedef struct HWND__* HWND'
  137 |         HWND hWnd;
      |         ^~~~
In file included from /wine/include/wine/windows/minwindef.h:258,
                 from /wine/include/wine/windows/windef.h:24,
                 from /wine/include/wine/windows/windows.h:38:
/wine/include/wine/windows/windef.h:59:16: note: declared here
   59 | DECLARE_HANDLE(HWND);
      |                ^~~~
---
 include/rpcasync.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/rpcasync.h b/include/rpcasync.h
index e51177c9859..228efe235db 100644
--- a/include/rpcasync.h
+++ b/include/rpcasync.h
@@ -26,6 +26,10 @@
 # pragma pack(push,8)
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct tagRPC_ERROR_ENUM_HANDLE
 {
     ULONG Signature;
@@ -165,10 +169,6 @@ typedef struct _RPC_ASYNC_STATE
 # pragma pack(pop)
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncInitializeHandle(PRPC_ASYNC_STATE,unsigned int);
 RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncRegisterInfo(PRPC_ASYNC_STATE);
 RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncGetCallStatus(PRPC_ASYNC_STATE);
-- 
GitLab

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