src/share/vm/runtime/globals.cpp

rev 8362 : [mq]: hotspot

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2014, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2015, 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.
*** 28,42 ****
  #include "runtime/arguments.hpp"
  #include "runtime/globals.hpp"
  #include "runtime/globals_extension.hpp"
  #include "runtime/os.hpp"
  #include "trace/tracing.hpp"
- #include "utilities/ostream.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/top.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc_implementation/g1/g1_globals.hpp"
  #endif // INCLUDE_ALL_GCS
  #ifdef COMPILER1
  #include "c1/c1_globals.hpp"
  #endif
  #ifdef COMPILER2
--- 28,42 ----
  #include "runtime/arguments.hpp"
  #include "runtime/globals.hpp"
  #include "runtime/globals_extension.hpp"
  #include "runtime/os.hpp"
  #include "trace/tracing.hpp"
  #include "utilities/macros.hpp"
+ #include "utilities/ostream.hpp"
  #include "utilities/top.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1_globals.hpp"
  #endif // INCLUDE_ALL_GCS
  #ifdef COMPILER1
  #include "c1/c1_globals.hpp"
  #endif
  #ifdef COMPILER2