# HG changeset patch
# User kevinw
# Date 1552409555 25200
# Node ID 7d134528324e3e6b613c38f691d5ea3b3497d822
# Parent  9da665f87c4b8936d8115a5968d3cd4f3aab49a1
8217305: Missing 0 in java.dll file version cause issues with patch management software
Reviewed-by: shade

diff -r 9da665f87c4b -r 7d134528324e common/autoconf/flags.m4
--- a/common/autoconf/flags.m4	Wed Oct 25 13:11:07 2017 -0700
+++ b/common/autoconf/flags.m4	Tue Mar 12 09:52:35 2019 -0700
@@ -111,7 +111,7 @@
         -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
         -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
         -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
-        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
+        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
   fi
   AC_SUBST(RC_FLAGS)
 
diff -r 9da665f87c4b -r 7d134528324e common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Wed Oct 25 13:11:07 2017 -0700
+++ b/common/autoconf/generated-configure.sh	Tue Mar 12 09:52:35 2019 -0700
@@ -4358,7 +4358,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1551441508
+DATE_WHEN_GENERATED=1552344461
 
 ###############################################################################
 #
@@ -40540,7 +40540,7 @@
         -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
         -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
         -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
-        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
+        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
   fi