src/share/vm/opto/adlcVMDeps.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 2003, 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) 1998, 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.
*** 20,29 ****
--- 20,38 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
+ #ifndef SHARE_VM_OPTO_ADLCVMDEPS_HPP
+ #define SHARE_VM_OPTO_ADLCVMDEPS_HPP
+ 
+ // adlcVMDeps.hpp is used by both adlc and vm builds.
+ // Only include allocation.hpp when we're not building adlc.
+ #ifndef SHARE_VM_ADLC_ARENA_HPP
+ #include "memory/allocation.hpp"
+ #endif
+ 
  // Declare commonly known constant and data structures between the
  // ADLC and the VM
  //
  
  class AdlcVMDeps : public AllStatic {
*** 40,44 ****
--- 49,55 ----
  
    // relocInfo
    static const char* oop_reloc_type()  { return "relocInfo::oop_type"; }
    static const char* none_reloc_type() { return "relocInfo::none"; }
  };
+ 
+ #endif // SHARE_VM_OPTO_ADLCVMDEPS_HPP