Mercurial > hg > truffle
diff src/share/vm/memory/allocation.hpp @ 1972:f95d63e2154a
6989984: Use standard include model for Hospot
Summary: Replaced MakeDeps and the includeDB files with more standardized solutions.
Reviewed-by: coleenp, kvn, kamg
author | stefank |
---|---|
date | Tue, 23 Nov 2010 13:22:55 -0800 |
parents | 894b1d7c7e01 |
children | 79d8657be916 |
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.hpp Tue Nov 23 15:01:43 2010 -0500 +++ b/src/share/vm/memory/allocation.hpp Tue Nov 23 13:22:55 2010 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -22,6 +22,18 @@ * */ +#ifndef SHARE_VM_MEMORY_ALLOCATION_HPP +#define SHARE_VM_MEMORY_ALLOCATION_HPP + +#include "runtime/globals.hpp" +#include "utilities/globalDefinitions.hpp" +#ifdef COMPILER1 +#include "c1/c1_globals.hpp" +#endif +#ifdef COMPILER2 +#include "opto/c2_globals.hpp" +#endif + #define ARENA_ALIGN_M1 (((size_t)(ARENA_AMALLOC_ALIGNMENT)) - 1) #define ARENA_ALIGN_MASK (~((size_t)ARENA_ALIGN_M1)) #define ARENA_ALIGN(x) ((((size_t)(x)) + ARENA_ALIGN_M1) & ARENA_ALIGN_MASK) @@ -419,3 +431,5 @@ ReallocMark() PRODUCT_RETURN; void check() PRODUCT_RETURN; }; + +#endif // SHARE_VM_MEMORY_ALLOCATION_HPP