Mercurial > hg > truffle
diff src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp @ 8894:dedbfa40d6a1
Merge
| author | Christos Kotselidis <christos.kotselidis@oracle.com> |
|---|---|
| date | Mon, 08 Apr 2013 16:30:51 +0200 |
| parents | 63e54c37ac64 |
| children |
line wrap: on
line diff
--- a/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Mon Apr 08 16:26:17 2013 +0200 +++ b/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Mon Apr 08 16:30:51 2013 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2013, 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 @@ -25,7 +25,6 @@ #ifndef OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_INLINE_HPP #define OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_INLINE_HPP -#include "orderAccess_solaris_x86.inline.hpp" #include "runtime/atomic.hpp" #include "runtime/os.hpp" #include "vm_version_x86.hpp"