2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e186d5d53..8134928758 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov  6 16:22:30 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* 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]
+
 Tue Nov  6 14:38:00 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/win32ole/test_win32ole.rb: now source encoding is UTF-8, so
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))