rev 6909 : 8065361: Fixup headers and definitions for INCLUDE_TRACE
Reviewed-by: sla, stefank

          --- old/hotspot/src/share/vm/trace/traceMacros.hpp
          +++ new/hotspot/src/share/vm/trace/traceMacros.hpp

   1    1  /*
   2    2   * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   3    3   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4    4   *
   5    5   * This code is free software; you can redistribute it and/or modify it
   6    6   * under the terms of the GNU General Public License version 2 only, as
   7    7   * published by the Free Software Foundation.
   8    8   *
   9    9   * This code is distributed in the hope that it will be useful, but WITHOUT
  10   10   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  11   11   * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12   12   * version 2 for more details (a copy is included in the LICENSE file that
  13   13   * accompanied this code).
  14   14   *

  15   15   * You should have received a copy of the GNU General Public License version
  16   16   * 2 along with this work; if not, write to the Free Software Foundation,
  17   17   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  18   18   *
  19   19   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  20   20   * or visit www.oracle.com if you need additional information or have any
  21   21   * questions.
  22   22   *
  23   23   */
  24   24  
  25      -#ifndef SHARE_VM_TRACE_TRACE_MACRO_HPP
  26      -#define SHARE_VM_TRACE_TRACE_MACRO_HPP
       25 +#ifndef SHARE_VM_TRACE_TRACEMACROS_HPP
       26 +#define SHARE_VM_TRACE_TRACEMACROS_HPP
  27   27  
  28   28  #define EVENT_THREAD_EXIT(thread)
  29   29  #define EVENT_THREAD_DESTRUCT(thread)
  30   30  
  31   31  #define TRACE_INIT_ID(k)
  32   32  #define TRACE_DATA TraceThreadData
  33   33  
  34   34  #define TRACE_START() JNI_OK
  35   35  #define TRACE_INITIALIZE() JNI_OK
  36   36  
  37   37  #define TRACE_DEFINE_KLASS_METHODS typedef int ___IGNORED_hs_trace_type1
  38   38  #define TRACE_DEFINE_KLASS_TRACE_ID typedef int ___IGNORED_hs_trace_type2
  39   39  #define TRACE_DEFINE_OFFSET typedef int ___IGNORED_hs_trace_type3
  40   40  #define TRACE_ID_OFFSET in_ByteSize(0); ShouldNotReachHere()
  41   41  #define TRACE_TEMPLATES(template)
  42   42  #define TRACE_INTRINSICS(do_intrinsic, do_class, do_name, do_signature, do_alias)
  43   43  
  44      -#endif
       44 +#endif // SHARE_VM_TRACE_TRACEMACROS_HPP
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX