https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c34c5e29f00159c6b8ee7…
commit c34c5e29f00159c6b8ee76d0eec8fe01ffc82386
Author: Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Thu Jan 9 20:16:43 2020 +0100
Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Fri Jun 10 23:21:41 2022 +0200
[CRT] Move __INTRIN_INLINE to mingw32.h to be available everywhere
Also use __attribute__((artificial)) for clang, too.
---
sdk/include/crt/_mingw.h | 12 ++++++++++++
sdk/include/crt/mingw32/intrin.h | 17 -----------------
2 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/sdk/include/crt/_mingw.h b/sdk/include/crt/_mingw.h
index 99030d543e4..6cdec9a88e7 100644
--- a/sdk/include/crt/_mingw.h
+++ b/sdk/include/crt/_mingw.h
@@ -244,6 +244,18 @@ allow GCC to optimize away some EH unwind code, at least in DW2 case.
*/
#endif
#endif /* DECLSPEC_HOTPATCH */
+#ifndef __INTRIN_INLINE
+# define __INTRIN_INLINE extern __inline__
__attribute__((__always_inline__,__gnu_inline__,artificial))
+#endif
+
+#ifndef HAS_BUILTIN
+# ifdef __clang__
+# define HAS_BUILTIN(x) __has_builtin(x)
+# else
+# define HAS_BUILTIN(x) 0
+# endif
+#endif
+
#ifdef __cplusplus
# define __mingw_ovr inline __cdecl
#elif defined (__GNUC__)
diff --git a/sdk/include/crt/mingw32/intrin.h b/sdk/include/crt/mingw32/intrin.h
index c7c6b6a0d29..051199a0315 100644
--- a/sdk/include/crt/mingw32/intrin.h
+++ b/sdk/include/crt/mingw32/intrin.h
@@ -30,23 +30,6 @@
#ifndef RC_INVOKED
-#ifndef __INTRIN_INLINE
-# ifdef __clang__
-# define __ATTRIBUTE_ARTIFICIAL
-# else
-# define __ATTRIBUTE_ARTIFICIAL __attribute__((artificial))
-# endif
-# define __INTRIN_INLINE extern __inline__
__attribute__((__always_inline__,__gnu_inline__)) __ATTRIBUTE_ARTIFICIAL
-#endif
-
-#ifndef HAS_BUILTIN
-# ifdef __clang__
-# define HAS_BUILTIN(x) __has_builtin(x)
-# else
-# define HAS_BUILTIN(x) 0
-# endif
-#endif
-
#ifndef _SIZE_T_DEFINED
#define _SIZE_T_DEFINED
#ifdef _WIN64