Changeset 83776 in vbox

Timestamp:

Apr 17, 2020 6:00:45 PM (5 years ago)

Author:

vboxsync

Message:

iprt/asm*,++: Contain the intrin.h mess in iprt/win/msvc_intrin.h. Hack it for bs3kit and no-crt to avoid dragging in malloc.h from UCRT with VC++ 14.1. bugref:8489

Location:

trunk/include

Files:

: 1 added
: 6 edited

VBox/vmm/ssm.h (modified) (1 diff)
iprt/asm-amd64-x86.h (modified) (1 diff)
iprt/asm-math.h (modified) (1 diff)
iprt/asm.h (modified) (1 diff)
iprt/nt/ntddk.h (modified) (1 diff)
iprt/nt/wdm.h (modified) (1 diff)
iprt/win/msvc_intrin.h (added)

Legend:

: Unmodified
: Added
: Removed

trunk/include/VBox/vmm/ssm.h

r82968	r83776
238	238	* @internal */
239	239	#define SSMFIELD_ENTRY_INT(Name, off, cb, enmTransformer, uFirstVer) \
240		{ (PFNSSMFIELDGETPUT)(uintptr_t)(enmTransformer), (~~off),~~ (cb), (uFirstVer), Name }
	240	{ (PFNSSMFIELDGETPUT)(uintptr_t)(enmTransformer), (uint32_t)(off), (uint32_t)(cb), (uFirstVer), Name }
241	241	/** Emit a SSMFIELD array entry.
242	242	* @internal */

trunk/include/iprt/asm-amd64-x86.h

-              r82968
+              r83776
 #if defined(_MSC_VER) && RT_INLINE_ASM_USES_INTRIN
+# pragma warning(push)
+# pragma warning(disable:4668) /* Several incorrect __cplusplus uses. */
+# pragma warning(disable:4255) /* Incorrect __slwpcb prototype. */
+# include <intrin.h>
+# pragma warning(pop)
+   /* Emit the intrinsics at all optimization levels. */
+/* Emit the intrinsics at all optimization levels. */
+# include <iprt/win/msvc_intrin.h>
 # pragma intrinsic(_ReadWriteBarrier)
 # pragma intrinsic(__cpuid)

trunk/include/iprt/asm-math.h

-              r82968
+              r83776
 #if defined(_MSC_VER) && RT_INLINE_ASM_USES_INTRIN
+# pragma warning(push)
+# pragma warning(disable:4668) /* Several incorrect __cplusplus uses. */
+# pragma warning(disable:4255) /* Incorrect __slwpcb prototype. */
+# include <intrin.h>
+# pragma warning(pop)
+  /* Emit the intrinsics at all optimization levels. */
+/* Emit the intrinsics at all optimization levels. */
+# include <iprt/win/msvc_intrin.h>
 # pragma intrinsic(__emul)
 # pragma intrinsic(__emulu)

trunk/include/iprt/asm.h

-              r82968
+              r83776
 #if defined(_MSC_VER) && RT_INLINE_ASM_USES_INTRIN
+# pragma warning(push)
+# pragma warning(disable:4668) /* Several incorrect __cplusplus uses. */
+# pragma warning(disable:4255) /* Incorrect __slwpcb prototype. */
+# include <intrin.h>
+# pragma warning(pop)
+  /* Emit the intrinsics at all optimization levels. */
+/* Emit the intrinsics at all optimization levels. */
+# include <iprt/win/msvc_intrin.h>
 # pragma intrinsic(_ReadWriteBarrier)
 # pragma intrinsic(__cpuid)

trunk/include/iprt/nt/ntddk.h

-              r82968
+              r83776
 /* Make sure we get the right prototypes. */
+#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/win/msvc_intrin.h>
 #define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap

trunk/include/iprt/nt/wdm.h

-              r82968
+              r83776
 /* Make sure we get the right prototypes. */
+#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/win/msvc_intrin.h>
 #define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap

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