summaryrefslogtreecommitdiff
path: root/atomic.h
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-06 07:30:49 +0000
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-06 07:30:49 +0000
commite2418e3fcada21067b98032d514c34586f078b5b (patch)
treefb72dad292b8358e383e670cdb58ce4ff91f4f40 /atomic.h
parentbba3ceafa5a79e2c5d90c13d630c94b66a5da797 (diff)
* atomic.h: add #include <sys/atomic.h> for the workaround of
header file name conflict of atomic.h with /usr/include/atomic.h on Solaris 10. [ruby-dev:46414] [Bug #7287] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'atomic.h')
-rw-r--r--atomic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/atomic.h b/atomic.h
index f4dd5db38a..4a5ba188b1 100644
--- a/atomic.h
+++ b/atomic.h
@@ -65,6 +65,7 @@ rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val)
#elif defined(__sun)
#include <atomic.h>
+#include <sys/atomic.h>
typedef unsigned int rb_atomic_t;
# define ATOMIC_SET(var, val) (void)atomic_swap_uint(&(var), (val))