summaryrefslogtreecommitdiff
path: root/ruby_atomic.h
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-06 15:00:44 +0000
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-06 15:00:44 +0000
commitf70a7cd20f5087867d0d6f61c9df180e6eccdf23 (patch)
tree45ac7fe08facec65b4a242bf73ed2a15cacc8243 /ruby_atomic.h
parentc4d8cc4eae6ae3ae10576a8396864baed3292b70 (diff)
downloadruby-f70a7cd20f5087867d0d6f61c9df180e6eccdf23.tar.gz
* configure.in (AC_CHECK_HEADERS): atomic.h for Solaris atomic_ops.
* ruby_atomic.h: Skip using Solaris10 atomic_ops on Solaris 9 or earlier if atomic.h is not available. [ruby-dev:47229] [Bug #8228] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby_atomic.h')
-rw-r--r--ruby_atomic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby_atomic.h b/ruby_atomic.h
index 135a8c7e79..4a53e60824 100644
--- a/ruby_atomic.h
+++ b/ruby_atomic.h
@@ -64,7 +64,7 @@ rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val)
# define ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange((LONG *)&(var), (val))
# endif
-#elif defined(__sun)
+#elif defined(__sun) && defined(HAVE_ATOMIC_H)
#include <atomic.h>
typedef unsigned int rb_atomic_t;