# HG changeset patch
# User erikj
# Date 1478079783 -3600
# Node ID 97e8b9b653f92219c3e351785b14f966b308b4ba
# Parent  d759799570f82a2e1b673b14634b198883475627
8063154: Checked in jvmti.h not in sync with generated jvmti.h
Reviewed-by: tbell

diff -r d759799570f8 -r 97e8b9b653f9 common/autoconf/flags.m4
--- a/common/autoconf/flags.m4	Wed Nov 02 07:36:55 2016 +0100
+++ b/common/autoconf/flags.m4	Wed Nov 02 10:43:03 2016 +0100
@@ -1007,6 +1007,7 @@
 
   # Setup some hard coded includes
   $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
+      -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
       -I${JDK_TOPDIR}/src/java.base/share/native/include \
       -I${JDK_TOPDIR}/src/java.base/$OPENJDK_$1_OS/native/include \
       -I${JDK_TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/include \
diff -r d759799570f8 -r 97e8b9b653f9 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Wed Nov 02 07:36:55 2016 +0100
+++ b/common/autoconf/generated-configure.sh	Wed Nov 02 10:43:03 2016 +0100
@@ -5093,7 +5093,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1477490418
+DATE_WHEN_GENERATED=1478079760
 
 ###############################################################################
 #
@@ -50278,6 +50278,7 @@
 
   # Setup some hard coded includes
   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
+      -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
       -I${JDK_TOPDIR}/src/java.base/share/native/include \
       -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
       -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/include \
@@ -51101,6 +51102,7 @@
 
   # Setup some hard coded includes
   OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK \
+      -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
       -I${JDK_TOPDIR}/src/java.base/share/native/include \
       -I${JDK_TOPDIR}/src/java.base/$OPENJDK_BUILD_OS/native/include \
       -I${JDK_TOPDIR}/src/java.base/$OPENJDK_BUILD_OS_TYPE/native/include \