nagachika	2013-04-14 03:04:57 +0900 (Sun, 14 Apr 2013)

  New Revision: 40285

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

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

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/configure.in
    branches/ruby_2_0_0/ruby_atomic.h
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/configure.in
===================================================================
--- ruby_2_0_0/configure.in	(revision 40284)
+++ ruby_2_0_0/configure.in	(revision 40285)
@@ -949,7 +949,7 @@ AC_CHECK_HEADERS(limits.h sys/file.h sys https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L949
 		 syscall.h pwd.h grp.h a.out.h utime.h direct.h sys/resource.h \
 		 sys/mkdev.h sys/utime.h xti.h netinet/in_systm.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: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40284)
+++ ruby_2_0_0/ChangeLog	(revision 40285)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Apr 14 03:00:51 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]
+
 Sun Apr 14 02:32:45 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* time.c (GetTimeval): check if already initialized instance.
Index: ruby_2_0_0/ruby_atomic.h
===================================================================
--- ruby_2_0_0/ruby_atomic.h	(revision 40284)
+++ ruby_2_0_0/ruby_atomic.h	(revision 40285)
@@ -64,7 +64,7 @@ rb_w32_atomic_or(volatile rb_atomic_t *v https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/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;
 
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40284)
+++ ruby_2_0_0/version.h	(revision 40285)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-14"
-#define RUBY_PATCHLEVEL 123
+#define RUBY_PATCHLEVEL 124
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40163


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