diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-13 18:04:57 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-13 18:04:57 +0000 |
| commit | 7bc0cea739304984fa8434d1051c69595fca85c4 (patch) | |
| tree | f9fe8b5ef3243018066ae650bb988d32662aa5b6 /ruby_atomic.h | |
| parent | 08c3e8edbd0ccb2b3c193545e0d735dbd9c3adca (diff) | |
merge revision(s) 40163: [Backport #8228]
* 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/branches/ruby_2_0_0@40285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby_atomic.h')
| -rw-r--r-- | ruby_atomic.h | 2 |
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; |