Changeset 83765 in vbox

Timestamp:

Apr 17, 2020 3:27:59 PM (5 years ago)

Author:

vboxsync

Message:

libxml2: VC++ 14.1 build tweaking. bugref:8489

File:

• trunk/src/libs/libxml2-2.9.4/Makefile.kmk (modified) (1 diff)

trunk/src/libs/libxml2-2.9.4/Makefile.kmk

@@ -32 +32 @@
 VBox-libxml2_CFLAGS.win    += -wd4305 # 'type cast' : truncation from 'xmlChar *' to 'long'
 VBox-libxml2_CFLAGS.win    += -wd4306 # 'type cast' : conversion from 'long' to 'void *' of greater size [TODO: check these out?]
-if1of ($(VBOX_VCC_TOOL_STEM), VCC120)
+if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120"
  VBox-libxml2_CFLAGS.win   += -wd4311 # parser.c(1346) : warning C4311: 'type cast' : pointer truncation from 'void *' to 'long'
  VBox-libxml2_CFLAGS.win   += -wd4312 # parser.c(1327) : warning C4312: 'type cast' : conversion from 'long' to 'void *' of greater size
  VBox-libxml2_CFLAGS.win   += -wd4005 # sdk\v7.1\include\sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition
+endif
+if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
+ VBox-libxml2_CFLAGS.win   += -wd4777 # timsort.h(326): warning C4777: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'unsigned int'
+ VBox-libxml2_CFLAGS.win   += -wd4477 # timsort.h(326): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'size_t'
 endif
 ifn1of ($(KBUILD_TARGET), win)