*** old/src/share/vm/prims/jvmtiEnter.xsl	Mon Sep 17 16:13:15 2012
--- new/src/share/vm/prims/jvmtiEnter.xsl	Mon Sep 17 16:13:14 2012

*** 1,8 ****
--- 1,8 ----
  <?xml version="1.0"?> 
  <!--
!  Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
!  Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  
   This code is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License version 2 only, as
   published by the Free Software Foundation.

*** 35,44 ****
--- 35,46 ----
  
  <xsl:template match="specification">
    <xsl:call-template name="sourceHeader"/>
    <xsl:text>
  # include "precompiled.hpp"
+ # include "utilities/macros.hpp"
+ #if INCLUDE_JVMTI
  # include "prims/jvmtiEnter.hpp"
  # include "prims/jvmtiRawMonitor.hpp"
  # include "prims/jvmtiUtil.hpp"
  
  </xsl:text>

*** 245,254 ****
--- 247,257 ----
      <xsl:with-param name="funcs" select="category/function[count(@hide)=0]"/>
    </xsl:call-template>
  
    <xsl:text>
  };
+ #endif // INCLUDE_JVMTI
  </xsl:text>
  </xsl:template>
  
  <xsl:template match="function" mode="functionid">
    <xsl:text>jvmti</xsl:text>

*** 467,477 ****
--- 470,480 ----
    <xsl:apply-templates select="parameters" mode="signature"/>
    <xsl:text>) {
  </xsl:text>
  
    <xsl:if test="not(contains(@jkernel,'yes'))">
!   <xsl:text>&#xA;#ifdef JVMTI_KERNEL &#xA;</xsl:text>
!   <xsl:text>&#xA;#if !INCLUDE_JVMTI &#xA;</xsl:text>
    <xsl:text>  return JVMTI_ERROR_NOT_AVAILABLE; &#xA;</xsl:text>
    <xsl:text>#else &#xA;</xsl:text>
    </xsl:if>
  
    <xsl:apply-templates select="." mode="traceSetUp"/>

*** 594,604 ****
--- 597,607 ----
    </xsl:choose>
    <xsl:text>  return err;
  </xsl:text>
  
    <xsl:if test="not(contains(@jkernel,'yes'))">
!   <xsl:text>#endif // JVMTI_KERNEL&#xA;</xsl:text>
!   <xsl:text>#endif // INCLUDE_JVMTI&#xA;</xsl:text>
    </xsl:if>
  
    <xsl:text>}&#xA;</xsl:text>
  </xsl:template>