1.1 --- a/src/share/vm/opto/adlcVMDeps.hpp Tue Nov 23 15:01:43 2010 -0500
1.2 +++ b/src/share/vm/opto/adlcVMDeps.hpp Tue Nov 23 13:22:55 2010 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -22,6 +22,15 @@
1.11 *
1.12 */
1.13
1.14 +#ifndef SHARE_VM_OPTO_ADLCVMDEPS_HPP
1.15 +#define SHARE_VM_OPTO_ADLCVMDEPS_HPP
1.16 +
1.17 +// adlcVMDeps.hpp is used by both adlc and vm builds.
1.18 +// Only include allocation.hpp when we're not building adlc.
1.19 +#ifndef SHARE_VM_ADLC_ARENA_HPP
1.20 +#include "memory/allocation.hpp"
1.21 +#endif
1.22 +
1.23 // Declare commonly known constant and data structures between the
1.24 // ADLC and the VM
1.25 //
1.26 @@ -42,3 +51,5 @@
1.27 static const char* oop_reloc_type() { return "relocInfo::oop_type"; }
1.28 static const char* none_reloc_type() { return "relocInfo::none"; }
1.29 };
1.30 +
1.31 +#endif // SHARE_VM_OPTO_ADLCVMDEPS_HPP
