ngoto	2012-11-06 16:30:49 +0900 (Tue, 06 Nov 2012)

  New Revision: 37491

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37491

  Log:
    * 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]

  Modified files:
    trunk/ChangeLog
    trunk/atomic.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37490)
+++ ChangeLog	(revision 37491)
@@ -1,3 +1,9 @@
+Tue Nov  6 16:22:30 2012  Naohisa Goto  <ngotogenome@g...>
+
+	* 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@r...>
 
 	* test/win32ole/test_win32ole.rb: now source encoding is UTF-8, so
Index: atomic.h
===================================================================
--- atomic.h	(revision 37490)
+++ atomic.h	(revision 37491)
@@ -65,6 +65,7 @@
 
 #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))

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/