The code is blocked the same way as before. This avoids a warning with clang:
../mingw-w64/mingw-w64-headers/include/winbase.h:3088:5: warning: macro
expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined]
#if MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS &&
defined (__cplusplus)
^
---
mingw-w64-headers/include/winbase.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mingw-w64-headers/include/winbase.h
b/mingw-w64-headers/include/winbase.h
index 90d5c37b..6191b3b4 100644
--- a/mingw-w64-headers/include/winbase.h
+++ b/mingw-w64-headers/include/winbase.h
@@ -3081,11 +3081,11 @@ extern "C" {
#if !defined (RC_INVOKED) && !defined (NOWINBASEINTERLOCK) && !defined
(_NTOS_) && !defined
(MICROSOFT_WINDOWS_WINBASE_INTERLOCKED_CPLUSPLUS_H_INCLUDED)
#define MICROSOFT_WINDOWS_WINBASE_INTERLOCKED_CPLUSPLUS_H_INCLUDED
-#if !defined (__WIDL__)
+#if !defined (__WIDL__) && defined (__cplusplus)
#if !defined
(MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS)
#define MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS
(_WIN32_WINNT >= 0x0502 || !defined (_WINBASE_))
#endif
-#if MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS &&
defined (__cplusplus)
+#if MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS
extern "C++" {
#if defined(__x86_64__) && defined(__CYGWIN__)
#define __MINGW_USE_INT64_INTERLOCKED_LONG
--
2.17.1
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
