ngoto	2013-04-07 00:00:44 +0900 (Sun, 07 Apr 2013)

  New Revision: 40163

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

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

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/ruby_atomic.h

Index: configure.in
===================================================================
--- configure.in	(revision 40162)
+++ configure.in	(revision 40163)
@@ -994,7 +994,7 @@ AC_CHECK_HEADERS(limits.h sys/file.h sys https://github.com/ruby/ruby/blob/trunk/configure.in#L994
 		 syscall.h pwd.h grp.h a.out.h utime.h direct.h sys/resource.h \
 		 sys/mkdev.h sys/utime.h float.h ieeefp.h \
 		 ucontext.h intrinsics.h langinfo.h locale.h sys/sendfile.h time.h \
-		 net/socket.h sys/socket.h process.h sys/prctl.h)
+		 net/socket.h sys/socket.h process.h sys/prctl.h atomic.h)
 
 dnl check for large file stuff
 mv confdefs.h confdefs1.h
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40162)
+++ ChangeLog	(revision 40163)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Apr  6 23:46:54 2013  Naohisa Goto  <ngotogenome@g...>
+
+	* 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]
+
 Sat Apr  6 23:40:40 2013  Tanaka Akira  <akr@f...>
 
 	* lib/resolv.rb: Support LOC resources.
Index: ruby_atomic.h
===================================================================
--- ruby_atomic.h	(revision 40162)
+++ ruby_atomic.h	(revision 40163)
@@ -64,7 +64,7 @@ rb_w32_atomic_or(volatile rb_atomic_t *v https://github.com/ruby/ruby/blob/trunk/ruby_atomic.h#L64
 #  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;
 

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