Under certain circumstances, the #pragma pop_macro("__has_builtin") at the bottom of intrin-impl.h can be called without ever having hit the #pragma push_macro("__has_builtin") at the top. Clang warns about this, so I have moved the push appropriately.

Patch attached.

dw

diff --git a/mingw-w64-headers/include/psdk_inc/intrin-impl.h b/mingw-w64-headers/include/psdk_inc/intrin-impl.h
index 7da3238..f8dc78f 100644
--- a/mingw-w64-headers/include/psdk_inc/intrin-impl.h
+++ b/mingw-w64-headers/include/psdk_inc/intrin-impl.h
@@ -61,6 +61,12 @@ __INTRINSICS_USEINLINE
 
 #ifdef __MINGW_INTRIN_INLINE
 
+/* Clang has support for MSVC builtins, GCC doesn't */
+#pragma push_macro("__has_builtin")
+#ifndef __has_builtin
+  #define __has_builtin(x) 0
+#endif
+
 /* These macros are used by the routines below.  While this file may be included 
    multiple times, these macros only need to be defined once. */
 #ifndef _INTRIN_MAC_
@@ -80,12 +86,6 @@ __INTRINSICS_USEINLINE
 #define __FLAGCLOBBER2
 #endif
 
-/* Clang has support for MSVC builtins, GCC doesn't */
-#pragma push_macro("__has_builtin")
-#ifndef __has_builtin
-  #define __has_builtin(x) 0
-#endif
-
 /* This macro is used by __stosb, __stosw, __stosd, __stosq */
 
 /* Parameters: (FunctionName, DataType, Operator)
------------------------------------------------------------------------------
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to