--- a/make/autoconf/flags-cflags.m4	Mon Mar 05 23:23:50 2018 +0100
+++ b/make/autoconf/flags-cflags.m4	Mon Mar 05 23:41:27 2018 +0100
@@ -184,10 +184,18 @@
     microsoft)
       DISABLE_WARNING_PREFIX="-wd"
       CFLAGS_WARNINGS_ARE_ERRORS="-WX"
-
-      WARNINGS_ENABLE_ALL="-Wall"
-      EVEN_MORE="4054 4055 4057 4100 4127 4131 4132 4152 4201 4204 4206 4210 4232 4244 4255 4263 4264 4295 4302 4306 4311 4324 4366 4388 4512 4548 4555 4574 4800 4986 4987"
-      DISABLED_WARNINGS="4061 4062 4130 4189 4191 4211 4242 4245 4265 4287 4296 4310 4312 4350 4355 4365 4389 4505 4510 4514 4571 4610 4619 4623 4625 4626 4640 4668 4701 4702 4703 4706 4710 4711 4820 4917 4946 $EVEN_MORE"
+      
+      # 4061
+      #WARNINGS_ENABLE_ALL="-Wall"
+      WARNINGS_ENABLE_ALL="-W4"
+      # 4061, 4062 = enum not handled
+      # 4130
+      #EVEN_MORE="4054 4055 4057 4100 4127 4131 4132 4152 4201 4204 4206 4210 4232 4244 4255 4263 4264 4295 4302 4306 4311 4324 4366 4388 4512 4548 4555 4574 4800 4986 4987"
+      #INIT_DISABLE=" 4189 4191 4211 4242 4245 4265 4287 4296 4310 4312 4350 4355 4365 4389 4505 4510 4514 4571 4610 4619 4623 4625 4626 4640 4668 4701 4702 4703 4706 4710 4711 4820 4917 4946 $EVEN_MORE"
+      #DISABLED_WARNINGS_WALL="4061 4062 $INIT_DISABLE"
+      RETRY_W4_HOTSPOT="4189 4211 4245 4310 4389 4505 4510 4610 4701 4702 4703 4706"
+      RETRY_W4_JDK="4054 4055 4057 4100 4127 4130 4131 4132 4152 4201 4204 4206 4210 4232 4244 4295 4306 4324 4366 4512 4800"
+      DISABLED_WARNINGS="$RETRY_W4_HOTSPOT $RETRY_W4_JDK"
       ;;
     solstudio)
       DISABLE_WARNING_PREFIX="-erroff="