# HG changeset patch
# User ihse
# Date 1431346548 -7200
# Node ID 8f2f69320a3aa7006175640406ff26880001340b
# Parent  c261149b9fff79cf371abe0a6afaca99aa3ba17e
8080013: OpenJDK windows build fails due to warning in libfontmanager
Reviewed-by: erikj

diff -r c261149b9fff -r 8f2f69320a3a jdk/make/lib/Awt2dLibraries.gmk
--- a/jdk/make/lib/Awt2dLibraries.gmk	Mon May 11 07:03:24 2015 -0400
+++ b/jdk/make/lib/Awt2dLibraries.gmk	Mon May 11 14:15:48 2015 +0200
@@ -653,7 +653,7 @@
     DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
         tautological-constant-out-of-range-compare int-to-pointer-cast, \
     DISABLED_WARNINGS_solstudio := truncwarn, \
-    DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996, \
+    DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146, \
     WARNINGS_AS_ERRORS_gcc := false, \
     WARNINGS_AS_ERRORS_solstudio := false, \
     MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \