From: Eric Pouech <epouech@codeweavers.com> Mainly wrapping the header inside extern "C" {...} Part 6: [s-t] range. Signed-off-by: Eric Pouech <epouech@codeweavers.com> --- include/softpub.h | 8 ++++++++ include/tdh.h | 9 +++++++++ include/tpcshrd.h | 7 +++++++ 3 files changed, 24 insertions(+) diff --git a/include/softpub.h b/include/softpub.h index ed10d8fd913..417af9b4a05 100644 --- a/include/softpub.h +++ b/include/softpub.h @@ -19,6 +19,10 @@ #ifndef __WINE_SOFTPUB_H #define __WINE_SOFTPUB_H +#ifdef __cplusplus +extern "C" { +#endif + #include <wintrust.h> #define WINTRUST_ACTION_GENERIC_CERT_VERIFY \ @@ -196,4 +200,8 @@ typedef struct DRIVER_VER_INFO_ DWORD dwBuildNumberHigh; } DRIVER_VER_INFO, *PDRIVER_VER_INFO; +#ifdef __cplusplus +} +#endif + #endif /* __WINE_SOFTPUB_H */ diff --git a/include/tdh.h b/include/tdh.h index 007ccfc7fb7..23c44e38fe5 100644 --- a/include/tdh.h +++ b/include/tdh.h @@ -19,6 +19,10 @@ #ifndef __WINE_TDH_H #define __WINE_TDH_H +#ifdef __cplusplus +extern "C" { +#endif + ULONG WINAPI TdhLoadManifest( WCHAR *manifest ); ULONG WINAPI TdhLoadManifestFromBinary( WCHAR *binary ); @@ -39,4 +43,9 @@ typedef struct _PROVIDER_ENUMERATION_INFO PROVIDER_ENUMERATION_INFO; ULONG WINAPI TdhEnumerateProviders( PROVIDER_ENUMERATION_INFO *buffer, ULONG *buffer_size ); + +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/tpcshrd.h b/include/tpcshrd.h index 8fe9d3fb8ac..809da0cd651 100644 --- a/include/tpcshrd.h +++ b/include/tpcshrd.h @@ -18,6 +18,10 @@ #ifndef __WISPSHRD_H #define __WISPSHRD_H +#ifdef __cplusplus +extern "C" { +#endif + #define TABLET_DISABLE_PRESSANDHOLD 0x00000001 #define WM_TABLET_DEFBASE 0x02c0 @@ -27,5 +31,8 @@ #define WM_TABLET_FLICK (WM_TABLET_DEFBASE + 11) #define WM_TABLET_QUERYSYSTEMGESTURESTATUS (WM_TABLET_DEFBASE + 12) +#ifdef __cplusplus +} +#endif #endif /* __WISPSHRD_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10303