Changeset 83776 in vbox for trunk/include/iprt/nt

Timestamp:

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

Author:

vboxsync

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

137301

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/iprt/nt

Files:

• ntddk.h (modified) (1 diff)
• wdm.h (modified) (1 diff)

trunk/include/iprt/nt/ntddk.h

@@ -31 +31 @@
 
 /* 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

@@ -31 +31 @@
 
 /* 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