Changeset 84119 in vbox for trunk/include/VBox/vmm

Timestamp:

Apr 30, 2020 7:53:39 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137709

Message:

hmvmxinline.h,stam.h: Use the intrin.h wrapper in iprt or we'll end up trying to drag in malloc.h when IPRT_NO_CRT is defined. bugref:8489

Location:

trunk/include/VBox/vmm

Files:

trunk/include/VBox/vmm/hmvmxinline.h

-              r82968
+              r84119
    when targeting AMD64. */
 #if RT_INLINE_ASM_USES_INTRIN >= 16 && defined(RT_ARCH_AMD64)
+# pragma warning(push)
+# pragma warning(disable:4668) /* Several incorrect __cplusplus uses. */
+# pragma warning(disable:4255) /* Incorrect __slwpcb prototype. */
+# include <intrin.h>
+# pragma warning(pop)
+# include <iprt/sanitized/intrin.h>
 /* We always want them as intrinsics, no functions. */
 # pragma intrinsic(__vmx_on)

-              r82968
+              r84119
 #include <iprt/stdarg.h>
 #ifdef _MSC_VER
+# if _MSC_VER >= 1400
+#  pragma warning(push)
+#  pragma warning(disable:4668) /* Several incorrect __cplusplus uses. */
+#  pragma warning(disable:4255) /* Incorrect __slwpcb prototype. */
+#  include <intrin.h>
+#  pragma warning(pop)
+# if RT_MSC_PREREQ(RT_MSC_VER_VS2005)
+#  include <iprt/sanitized/intrin.h>
 # endif
 #endif
 …
 # endif
 #else
 # if _MSC_VER >= 1400
+# if RT_MSC_PREREQ(RT_MSC_VER_VS2005)
 #  pragma intrinsic(__rdtsc)
 #  define STAM_GET_TS(u64)    \

Note: See TracChangeset for help on using the changeset viewer.