Mercurial > hg > truffle
diff src/share/vm/utilities/accessFlags.cpp @ 2044:06f017f7daa7
Merge.
| author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
|---|---|
| date | Fri, 07 Jan 2011 18:18:08 +0100 |
| parents | f95d63e2154a |
| children | f08d439fab8c |
line wrap: on
line diff
--- a/src/share/vm/utilities/accessFlags.cpp Wed Dec 29 20:06:41 2010 +0100 +++ b/src/share/vm/utilities/accessFlags.cpp Fri Jan 07 18:18:08 2011 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, 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,8 +22,18 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_accessFlags.cpp.incl" +#include "precompiled.hpp" +#include "oops/oop.inline.hpp" +#include "utilities/accessFlags.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "os_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "os_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "os_windows.inline.hpp" +#endif void AccessFlags::atomic_set_bits(jint bits) {