Mercurial > hg > truffle
diff src/share/vm/oops/klassPS.hpp @ 2044:06f017f7daa7
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Fri, 07 Jan 2011 18:18:08 +0100 |
parents | f95d63e2154a |
children | e5383553fd4e |
line wrap: on
line diff
--- a/src/share/vm/oops/klassPS.hpp Wed Dec 29 20:06:41 2010 +0100 +++ b/src/share/vm/oops/klassPS.hpp Fri Jan 07 18:18:08 2011 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 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 @@ -21,8 +21,9 @@ * questions. * */ -#ifndef KLASS_PS_H -#define KLASS_PS_H + +#ifndef SHARE_VM_OOPS_KLASSPS_HPP +#define SHARE_VM_OOPS_KLASSPS_HPP // Expands to Parallel Scavenge and Parallel Old declarations @@ -52,4 +53,4 @@ #define PARALLEL_GC_DECLS_PV #endif // SERIALGC -#endif // KLASS_PS_H +#endif // SHARE_VM_OOPS_KLASSPS_HPP