From: Eric Pouech <epouech@codeweavers.com> Mainly wrapping the header inside extern "C" {...} Part 3: [i-l] range. Signed-off-by: Eric Pouech <epouech@codeweavers.com> --- include/icu.h | 8 ++++++++ include/ifdef.h | 8 ++++++++ include/intsafe.h | 11 +++++++++++ include/ipifcons.h | 8 ++++++++ include/iptypes.h | 8 ++++++++ include/ks.h | 8 ++++++++ 6 files changed, 51 insertions(+) diff --git a/include/icu.h b/include/icu.h index 65615e9bc78..6b9eb6ebc5e 100644 --- a/include/icu.h +++ b/include/icu.h @@ -44,6 +44,10 @@ #ifndef __WINE_ICU_H #define __WINE_ICU_H +#ifdef __cplusplus +extern "C" { +#endif + #define U_MAX_VERSION_LENGTH 4 typedef uint8_t UBiDiLevel; @@ -3038,4 +3042,8 @@ void __cdecl utrans_transIncrementalUChars(const UTransliterator *trans, UChar * void __cdecl utrans_transUChars(const UTransliterator *trans, UChar *text, int32_t *textLength, int32_t textCapacity, int32_t start, int32_t *limit, UErrorCode *status); void __cdecl utrans_unregisterID(const UChar *id, int32_t idLength); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_ICU_H */ diff --git a/include/ifdef.h b/include/ifdef.h index bdda8a20df8..2af86de1e04 100644 --- a/include/ifdef.h +++ b/include/ifdef.h @@ -18,6 +18,10 @@ #ifndef WINE_IFDEF_H #define WINE_IFDEF_H +#ifdef __cplusplus +extern "C" { +#endif + #include <ipifcons.h> typedef ULONG32 NET_IF_OBJECT_ID, *PNET_IF_OBJECT_ID; @@ -226,4 +230,8 @@ typedef struct _NDIS_INTERFACE_INFORMATION { ULONG SupportedStatistics; } NDIS_INTERFACE_INFORMATION, *PNDIS_INTERFACE_INFORMATION; +#ifdef __cplusplus +} +#endif + #endif /* WINE_IFDEF_H*/ diff --git a/include/intsafe.h b/include/intsafe.h index e1fef256147..64c77fac7e8 100644 --- a/include/intsafe.h +++ b/include/intsafe.h @@ -7,6 +7,11 @@ #ifndef _INTSAFE_H_INCLUDED_ #define _INTSAFE_H_INCLUDED_ +#ifdef __cplusplus +extern "C" { +#endif + + #include <winapifamily.h> #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) @@ -1050,5 +1055,11 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define Int64Mult LongLongMult #endif /* __MINGW_INTSAFE_WORKS */ + #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ + +#ifdef __cplusplus +} +#endif + #endif /* _INTSAFE_H_INCLUDED_ */ diff --git a/include/ipifcons.h b/include/ipifcons.h index a29ddb28c14..8cc18dac8b9 100644 --- a/include/ipifcons.h +++ b/include/ipifcons.h @@ -18,6 +18,10 @@ #ifndef WINE_IPIFCONS_H__ #define WINE_IPIFCONS_H__ +#ifdef __cplusplus +extern "C" { +#endif + #define IF_TYPE_OTHER 1 #define IF_TYPE_REGULAR_1822 2 #define IF_TYPE_HDH_1822 3 @@ -243,4 +247,8 @@ typedef enum _INTERNAL_IF_OPER_STATUS MIB_IF_OPER_STATUS_OPERATIONAL = 5, } INTERNAL_IF_OPER_STATUS; +#ifdef __cplusplus +} +#endif + #endif /* WINE_IPIFCONS_H__ */ diff --git a/include/iptypes.h b/include/iptypes.h index d8609654748..bae5da9c0fb 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -19,6 +19,10 @@ #ifndef WINE_IPTYPES_H_ #define WINE_IPTYPES_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include <time.h> #include <ifdef.h> #include <nldef.h> @@ -332,4 +336,8 @@ typedef IP_ADAPTER_ADDRESSES_LH *PIP_ADAPTER_ADDRESSES; #endif /* _WINSOCK2API_ */ +#ifdef __cplusplus +} +#endif + #endif /* WINE_IPTYPES_H_*/ diff --git a/include/ks.h b/include/ks.h index 168357ed1cc..f7320456129 100644 --- a/include/ks.h +++ b/include/ks.h @@ -19,6 +19,10 @@ #ifndef _KS_ #define _KS_ +#ifdef __cplusplus +extern "C" { +#endif + typedef union tagKSIDENTIFIER { struct @@ -63,4 +67,8 @@ typedef union unionKSDATAFORMAT LONGLONG Alignment; } KSDATAFORMAT, *PKSDATAFORMAT, KSDATARANGE, *PKSDATARANGE; +#ifdef __cplusplus +} +#endif + #endif /* _KS_ */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10303