From: Eric Pouech <epouech@codeweavers.com> Mainly wrapping the header inside extern "C" {...} Part 2: [d-e] range. Signed-off-by: Eric Pouech <epouech@codeweavers.com> --- include/d3d10_1shader.h | 8 ++++++++ include/d3d11shader.h | 8 ++++++++ include/davclnt.h | 8 ++++++++ include/devquerydef.h | 8 ++++++++ include/dhcpcsdk.h | 8 ++++++++ include/driverspecs.h | 8 ++++++++ include/dvdmedia.h | 8 ++++++++ include/errorrep.h | 8 ++++++++ 8 files changed, 64 insertions(+) diff --git a/include/d3d10_1shader.h b/include/d3d10_1shader.h index 06dded7e0e8..e562a96ac09 100644 --- a/include/d3d10_1shader.h +++ b/include/d3d10_1shader.h @@ -19,6 +19,10 @@ #ifndef __D3D10_1SHADER_H__ #define __D3D10_1SHADER_H__ +#ifdef __cplusplus +extern "C" { +#endif + #include "d3d10shader.h" DEFINE_GUID(IID_ID3D10ShaderReflection1, 0xc3457783, 0xa846, 0x47ce, 0x95, 0x20, 0xce, 0xa6, 0xf6, 0x6e, 0x74, 0x47); @@ -49,4 +53,8 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection1, IUnknown) }; #undef INTERFACE +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/d3d11shader.h b/include/d3d11shader.h index 236ca023c00..5941bc5db64 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -19,6 +19,10 @@ #ifndef __D3D11SHADER_H__ #define __D3D11SHADER_H__ +#ifdef __cplusplus +extern "C" { +#endif + #include "d3dcommon.h" /* If not defined set d3dcompiler_47 by default. */ @@ -335,4 +339,8 @@ DECLARE_INTERFACE_(ID3D11FunctionLinkingGraph, IUnknown) }; #undef INTERFACE +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/davclnt.h b/include/davclnt.h index 77c22e0762e..16dc35474fd 100644 --- a/include/davclnt.h +++ b/include/davclnt.h @@ -19,6 +19,10 @@ #ifndef __WINE_DAVCLNT_H #define __WINE_DAVCLNT_H +#ifdef __cplusplus +extern "C" { +#endif + #define OPAQUE_HANDLE DWORD #define DAV_AUTHN_SCHEME_BASIC 0x00000001 @@ -70,4 +74,8 @@ DWORD WINAPI DavGetUNCFromHTTPPath(LPCWSTR,LPWSTR,LPDWORD); OPAQUE_HANDLE WINAPI DavRegisterAuthCallback(PFNDAVAUTHCALLBACK,ULONG); VOID WINAPI DavUnregisterAuthCallback(OPAQUE_HANDLE); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_DAVCLNT_H */ diff --git a/include/devquerydef.h b/include/devquerydef.h index 5ad01205a16..40e03ab8479 100644 --- a/include/devquerydef.h +++ b/include/devquerydef.h @@ -19,6 +19,10 @@ #ifndef __DEVQUERYDEF_H__ #define __DEVQUERYDEF_H__ +#ifdef __cplusplus +extern "C" { +#endif + typedef enum _DEV_OBJECT_TYPE { DevObjectTypeUnknown, @@ -87,4 +91,8 @@ typedef struct _DEV_QUERY_PARAMETER void *Buffer; } DEV_QUERY_PARAMETER, *PDEV_QUERY_PARAMETER; +#ifdef __cplusplus +} +#endif + #endif /* __DEVQUERYDEF_H__ */ diff --git a/include/dhcpcsdk.h b/include/dhcpcsdk.h index 8f96a8212d4..d9f2b913685 100644 --- a/include/dhcpcsdk.h +++ b/include/dhcpcsdk.h @@ -18,6 +18,10 @@ #ifndef _DHCPCSDK_ #define _DHCPCSDK_ +#ifdef __cplusplus +extern "C" { +#endif + #define OPTION_PAD 0 #define OPTION_SUBNET_MASK 1 #define OPTION_TIME_OFFSET 2 @@ -122,4 +126,8 @@ DWORD WINAPI DhcpCApiInitialize(DWORD *); DWORD WINAPI DhcpRequestParams(DWORD, void *, WCHAR *, DHCPCAPI_CLASSID *, DHCPCAPI_PARAMS_ARRAY, DHCPCAPI_PARAMS_ARRAY, BYTE *, DWORD *, WCHAR *); +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/driverspecs.h b/include/driverspecs.h index 509a2bd44bf..50fa78a95f3 100644 --- a/include/driverspecs.h +++ b/include/driverspecs.h @@ -9,6 +9,10 @@ #ifndef DRIVERSPECS_H #define DRIVERSPECS_H +#ifdef __cplusplus +extern "C" { +#endif + #include <specstrings.h> #include <concurrencysal.h> @@ -52,4 +56,8 @@ #define __user_code #define __user_driver +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/dvdmedia.h b/include/dvdmedia.h index 6e625b472f8..a61f1ce01fa 100644 --- a/include/dvdmedia.h +++ b/include/dvdmedia.h @@ -19,6 +19,10 @@ #ifndef __DVDMEDIA_H__ #define __DVDMEDIA_H__ +#ifdef __cplusplus +extern "C" { +#endif + #define AMCONTROL_USED 0x00000001 #define AMCONTROL_PAD_TO_4x3 0x00000002 #define AMCONTROL_PAD_TO_16x9 0x00000004 @@ -66,4 +70,8 @@ typedef struct tagMPEG2VIDEOINFO { #define AMINTERLACE_DisplayModeBobOrWeave 0x0080 #define AMINTERLACE_DisplayModeMask 0x00c0 +#ifdef __cplusplus +} +#endif + #endif /* __DVDMEDIA_H__ */ diff --git a/include/errorrep.h b/include/errorrep.h index 5af7bf69450..ee8c492f417 100644 --- a/include/errorrep.h +++ b/include/errorrep.h @@ -21,6 +21,10 @@ #ifndef __WINE_ERRORREP_H #define __WINE_ERRORREP_H +#ifdef __cplusplus +extern "C" { +#endif + typedef enum tagEFaultRepRetVal { frrvOk, @@ -40,4 +44,8 @@ BOOL WINAPI AddERExcludedApplicationA(LPCSTR); BOOL WINAPI AddERExcludedApplicationW(LPCWSTR); #define AddERExcludedApplication WINELIB_NAME_AW(AddERExcludedApplication) +#ifdef __cplusplus +} +#endif + #endif /* __WINE_ERORREP_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10303