From: Eric Pouech <epouech@codeweavers.com> Mainly wrapping the header inside extern "C" {...} Part 6: [w-] range. Signed-off-by: Eric Pouech <epouech@codeweavers.com> --- include/wiadef.h | 13 +++++++++++++ include/winber.h | 8 ++++++++ include/wincontypes.h | 8 ++++++++ include/winioctl.h | 10 +++++++++- include/winsmcrd.h | 8 ++++++++ include/wlanapi.h | 8 ++++++++ include/wofapi.h | 13 +++++++++++++ include/ws2def.h | 8 ++++++++ include/wsdutil.h | 8 ++++++++ include/wspiapi.h | 8 ++++++++ 10 files changed, 91 insertions(+), 1 deletion(-) diff --git a/include/wiadef.h b/include/wiadef.h index bd958728388..b711e4e6401 100644 --- a/include/wiadef.h +++ b/include/wiadef.h @@ -18,6 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIADEF_H_ +#define _WIADEF_H_ + +#ifdef __cplusplus +extern "C" { +#endif + #define WIA_DEVINFO_ENUM_ALL 0x0000000f #define WIA_DEVINFO_ENUM_LOCAL 0x00000010 @@ -26,3 +33,9 @@ #define BASE_VAL_WIA_ERROR 0x00000000 #define WIA_S_NO_DEVICE_AVAILABLE MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIA, (BASE_VAL_WIA_ERROR + 21)) + +#ifdef __cplusplus +} +#endif + +#endif /* _WIADEF_H_ */ diff --git a/include/winber.h b/include/winber.h index cb4f8e3ff54..450c1b4d8b1 100644 --- a/include/winber.h +++ b/include/winber.h @@ -19,6 +19,10 @@ #ifndef __WINE_WINBER_H #define __WINE_WINBER_H +#ifdef __cplusplus +extern "C" { +#endif + #define LBER_ERROR (~0L) #define LBER_DEFAULT (~0L) @@ -41,4 +45,8 @@ int WINAPIV ber_printf( BerElement *, char *, ... ); ULONG WINAPIV ber_scanf( BerElement *, char *, ... ); ULONG CDECL ber_skip_tag( BerElement *, ULONG * ); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_WINBER_H */ diff --git a/include/wincontypes.h b/include/wincontypes.h index d724a80921d..5bf19337946 100644 --- a/include/wincontypes.h +++ b/include/wincontypes.h @@ -19,6 +19,10 @@ #ifndef _WINCONTYPES_ #define _WINCONTYPES_ +#ifdef __cplusplus +extern "C" { +#endif + typedef struct tagCOORD { SHORT X; @@ -132,4 +136,8 @@ typedef struct _CONSOLE_FONT_INFO typedef void *HPCON; +#ifdef __cplusplus +} +#endif + #endif /* _WINCONTYPES_ */ diff --git a/include/winioctl.h b/include/winioctl.h index 08fb307a321..119a5578647 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -19,7 +19,11 @@ #ifndef __WINE_WINIOCTL_H #define __WINE_WINIOCTL_H -#define CTL_CODE( DeviceType, Function, Method, Access ) ( \ +#ifdef __cplusplus +extern "C" { +#endif + +#define CTL_CODE( DeviceType, Function, Method, Access ) ( \ (DWORD)((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \ ) @@ -698,4 +702,8 @@ DEFINE_GUID(GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, 0x4D36E978, 0xE325, #endif /* DEFINE_GUID */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/winsmcrd.h b/include/winsmcrd.h index 15c427c48da..0bb426d007b 100644 --- a/include/winsmcrd.h +++ b/include/winsmcrd.h @@ -19,6 +19,10 @@ #ifndef __WINE_WINSMCRD_H #define __WINE_WINSMCRD_H +#ifdef __cplusplus +extern "C" { +#endif + #define SCARD_PROTOCOL_UNDEFINED 0x00000000 #define SCARD_PROTOCOL_OPTIMAL 0x00000000 #define SCARD_PROTOCOL_T0 0x00000001 @@ -60,4 +64,8 @@ typedef struct _SCARD_IO_REQUEST } SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST; typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST; +#ifdef __cplusplus +} +#endif + #endif /* __WINE_WINSMCRD_H */ diff --git a/include/wlanapi.h b/include/wlanapi.h index 5150ff09f47..4bcbe51321b 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -19,6 +19,10 @@ #ifndef _WLAN_WLANAPI_H #define _WLAN_WLANAPI_H +#ifdef __cplusplus +extern "C" { +#endif + #include <windot11.h> typedef enum _WLAN_INTERFACE_STATE @@ -254,4 +258,8 @@ DWORD WINAPI WlanRegisterNotification(HANDLE, DWORD, BOOL, WLAN_NOTIFICATION_CAL DWORD WINAPI WlanGetAvailableNetworkList(HANDLE, const GUID *, DWORD, void *, WLAN_AVAILABLE_NETWORK_LIST **); DWORD WINAPI WlanQueryInterface(HANDLE, const GUID *, WLAN_INTF_OPCODE, void *, DWORD *, void **, WLAN_OPCODE_VALUE_TYPE *); +#ifdef __cplusplus +} +#endif + #endif /* _WLAN_WLANAPI_H */ diff --git a/include/wofapi.h b/include/wofapi.h index 8d678dc2d08..7de40aa2e5e 100644 --- a/include/wofapi.h +++ b/include/wofapi.h @@ -16,4 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WOFAPI_H_ +#define _WOFAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + BOOL WINAPI WofShouldCompressBinaries(const WCHAR *, ULONG *); + +#ifdef __cplusplus +} +#endif + +#endif /* _WOFAPI_H_ */ diff --git a/include/ws2def.h b/include/ws2def.h index dc3201924c1..17df6331a5b 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -19,6 +19,10 @@ #ifndef _WS2DEF_ #define _WS2DEF_ +#ifdef __cplusplus +extern "C" { +#endif + #include <inaddr.h> #ifdef USE_WS_PREFIX @@ -332,4 +336,8 @@ typedef struct addrinfoexW { struct addrinfoexW *ai_next; } ADDRINFOEXW, *PADDRINFOEXW, *LPADDRINFOEXW; +#ifdef __cplusplus +} +#endif + #endif /* _WS2DEF_ */ diff --git a/include/wsdutil.h b/include/wsdutil.h index b118fcf7861..00807b64acb 100644 --- a/include/wsdutil.h +++ b/include/wsdutil.h @@ -19,6 +19,10 @@ #ifndef WSDUTIL_H #define WSDUTIL_H +#ifdef __cplusplus +extern "C" { +#endif + void * WINAPI WSDAllocateLinkedMemory(void *parent, SIZE_T size) __WINE_ALLOC_SIZE(2) __WINE_MALLOC; void WINAPI WSDAttachLinkedMemory(void *pParent, void *pChild); void WINAPI WSDDetachLinkedMemory(void *pVoid); @@ -30,4 +34,8 @@ HRESULT WINAPI WSDXMLBuildAnyForSingleElement(WSDXML_NAME *pElementName, LPCWSTR HRESULT WINAPI WSDXMLCleanupElement(WSDXML_ELEMENT *pAny); HRESULT WINAPI WSDXMLGetValueFromAny(const WCHAR *pszNamespace, const WCHAR *pszName, WSDXML_ELEMENT *pAny, LPCWSTR *ppszValue); +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/wspiapi.h b/include/wspiapi.h index 7aa034e753a..32ba4d65730 100644 --- a/include/wspiapi.h +++ b/include/wspiapi.h @@ -19,8 +19,16 @@ #ifndef _WSPIAPI_H_ #define _WSPIAPI_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include <stdio.h> #include <stdlib.h> #include <string.h> +#ifdef __cplusplus +} +#endif + #endif /* _WSPIAPI_H_ */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10303