Changeset 84406 in vbox for trunk/include/iprt/win

Timestamp:

May 20, 2020 2:27:48 PM (5 years ago)

Author:

vboxsync

Message:

iprt/win: VC++ 19.0 adjustments. bugref:8489

Location:

trunk/include/iprt/win

Files:

• d3dkmthk.h (modified) (1 diff)
• dbghelp.h (modified) (1 diff)
• endpointvolume.h (added)
• imagehlp.h (modified) (1 diff)
• shlobj.h (modified) (1 diff)

trunk/include/iprt/win/d3dkmthk.h

@@ -32 +32 @@
 #ifdef _MSC_VER
 # pragma warning(push)
-# if _MSC_VER >= 1910 /*RT_MSC_VER_VC141*/
+# if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
 #  pragma warning(disable:4255) /* d3dkmthk.h(2061): warning C4255: 'PFND3DKMT_CHECKEXCLUSIVEOWNERSHIP': no function prototype given: converting '()' to '(void)' */
 # endif

trunk/include/iprt/win/dbghelp.h

@@ -32 +32 @@
 #ifdef _MSC_VER
 /*
- * Unfortunately, the Windows.h file in SDK 7.1 is not clean wrt warning C4091 with VCC141:
+ * Unfortunately, the Windows.h file in SDK 7.1 is not clean wrt warning C4091 with VCC140+:
  *      Dbghelp.h(1540): warning C4091: 'typedef ': ignored on left of '<unnamed-enum-hdBase>' when no variable is declared
  *      Dbghelp.h(3056): warning C4091: 'typedef ': ignored on left of '<unnamed-enum-sfImage>' when no variable is declared
  */
 # pragma warning(push)
-# if _MSC_VER >= 1910 /*RT_MSC_VER_VC141*/
+# if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
 #  pragma warning(disable:4091)
 # endif

trunk/include/iprt/win/imagehlp.h

@@ -37 +37 @@
  */
 # pragma warning(push)
-# if _MSC_VER >= 1910 /*RT_MSC_VER_VC141*/
+# if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
 #  pragma warning(disable:4091)
 # endif

trunk/include/iprt/win/shlobj.h

@@ -33 +33 @@
 # pragma warning(push)
 # pragma warning(disable:4668) /* warning C4668: 'USE_SP_ALTPLATFORM_INFO_V1' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
-#endif
-#if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
-# pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
-# pragma warning(disable:4255) /* windef.h(227) : warning C4255: 'NEARPROC' : no function prototype given: converting '()' to '(void)' */
-#endif
-#if _MSC_VER >= 1910 /*RT_MSC_VER_VC141*/
-# pragma warning(disable:4768) /* sdk/v7.1/include/shlobj.h(1065): warning C4768: __declspec attributes before linkage specification are ignored */
-# pragma warning(disable:4091) /* sdk/v7.1/include/shlobj.h(1151): warning C4091: 'typedef ': ignored on left of 'tagGPFIDL_FLAGS' when no variable is declared */
+# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
+#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
+#  pragma warning(disable:4255) /* windef.h(227) : warning C4255: 'NEARPROC' : no function prototype given: converting '()' to '(void)' */
+# endif
+# if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
+#  pragma warning(disable:4091) /* sdk/v7.1/include/shlobj.h(1151): warning C4091: 'typedef ': ignored on left of 'tagGPFIDL_FLAGS' when no variable is declared */
+# endif
+# if _MSC_VER >= 1910 /*RT_MSC_VER_VC141*/
+#  pragma warning(disable:4768) /* sdk/v7.1/include/shlobj.h(1065): warning C4768: __declspec attributes before linkage specification are ignored */
+# endif
 #endif