Mercurial > hg > truffle

diff src/share/vm/runtime/atomic.cpp @ 17812:a7d4d4655766

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Wed, 26 Mar 2014 18:21:05 -0700
parents a9becfeecd1b
children 4ca6dc0799b6
line wrap: on
line diff
--- a/src/share/vm/runtime/atomic.cpp	Mon Mar 24 10:48:44 2014 -0700
+++ b/src/share/vm/runtime/atomic.cpp	Wed Mar 26 18:21:05 2014 -0700
@@ -33,6 +33,9 @@
 #ifdef TARGET_OS_FAMILY_windows
 # include "os_windows.inline.hpp"
 #endif
+#ifdef TARGET_OS_FAMILY_aix
+# include "os_aix.inline.hpp"
+#endif
 #ifdef TARGET_OS_FAMILY_bsd
 # include "os_bsd.inline.hpp"
 #endif