From: Eric Pouech <epouech@codeweavers.com> Mainly wrapping the header inside extern "C" {...} Part 1 : [a-c] range. Signed-off-by: Eric Pouech <epouech@codeweavers.com> --- include/amaudio.h | 8 ++++++++ include/amva.h | 8 ++++++++ include/bcrypt.h | 8 ++++++++ include/concurrencysal.h | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/include/amaudio.h b/include/amaudio.h index e684821b929..a66647e56b2 100644 --- a/include/amaudio.h +++ b/include/amaudio.h @@ -19,6 +19,10 @@ #ifndef __AMAUDIO__ #define __AMAUDIO__ +#ifdef __cplusplus +extern "C" { +#endif + #include <mmsystem.h> #include <dsound.h> @@ -44,4 +48,8 @@ DECLARE_INTERFACE_(IAMDirectSound,IUnknown) }; #undef INTERFACE +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/amva.h b/include/amva.h index faf103270fc..e94a9dbf7a0 100644 --- a/include/amva.h +++ b/include/amva.h @@ -19,6 +19,10 @@ #ifndef __AMVA_INCLUDED__ #define __AMVA_INCLUDED__ +#ifdef __cplusplus +extern "C" { +#endif + typedef struct _tag_AMVABeginFrameInfo { DWORD dwDestSurfaceIndex; @@ -71,4 +75,8 @@ typedef struct _tag_AMVAUncompDataInfo DDPIXELFORMAT ddUncompPixelFormat; } AMVAUncompDataInfo, *LPAMVAUncompDataInfo; +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/bcrypt.h b/include/bcrypt.h index b0cdf6e27a3..0830c14b299 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -19,6 +19,10 @@ #ifndef __WINE_BCRYPT_H #define __WINE_BCRYPT_H +#ifdef __cplusplus +extern "C" { +#endif + #ifndef WINAPI #define WINAPI __stdcall #endif @@ -604,4 +608,8 @@ NTSTATUS WINAPI BCryptSetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptSignHash(BCRYPT_KEY_HANDLE, void *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptVerifySignature(BCRYPT_KEY_HANDLE, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_BCRYPT_H */ diff --git a/include/concurrencysal.h b/include/concurrencysal.h index fc86045e9fc..582a282bfb4 100644 --- a/include/concurrencysal.h +++ b/include/concurrencysal.h @@ -7,6 +7,10 @@ #ifndef CONCURRENCYSAL_HXX #define CONCURRENCYSAL_HXX +#ifdef __cplusplus +extern "C" { +#endif + #define _Benign_race_begin_ #define _Benign_race_end_ #define _No_competing_thread_begin_ @@ -45,4 +49,8 @@ #define _Requires_no_locks_held_ #define _Write_guarded_by_(lock) +#ifdef __cplusplus +} +#endif + #endif -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10303