ruby-changes:28664
From: usa <ko1@a...>
Date: Tue, 14 May 2013 11:23:40 +0900 (JST)
Subject: [ruby-changes:28664] usa:r40716 (ruby_1_9_3): merge revision(s) 40163: [Backport #8228]
usa 2013-05-14 11:23:27 +0900 (Tue, 14 May 2013) New Revision: 40716 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40716 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_1_9_3/ Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/configure.in branches/ruby_1_9_3/ruby_atomic.h branches/ruby_1_9_3/version.h Index: ruby_1_9_3/configure.in =================================================================== --- ruby_1_9_3/configure.in (revision 40715) +++ ruby_1_9_3/configure.in (revision 40716) @@ -1169,7 +1169,7 @@ AC_CHECK_HEADERS(limits.h sys/file.h sys https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/configure.in#L1169 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) + net/socket.h sys/socket.h process.h atomic.h) AC_TYPE_SIZE_T RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>]) Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 40715) +++ ruby_1_9_3/ChangeLog (revision 40716) @@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1 +Tue May 14 11:22:33 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] + Tue May 14 10:42:23 2013 Nobuyoshi Nakada <nobu@r...> * lib/mkmf.rb (MAIN_DOES_NOTHING): ensure symbols for tests to be Index: ruby_1_9_3/ruby_atomic.h =================================================================== --- ruby_1_9_3/ruby_atomic.h (revision 40715) +++ ruby_1_9_3/ruby_atomic.h (revision 40716) @@ -63,7 +63,7 @@ rb_w32_atomic_or(volatile rb_atomic_t *v https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ruby_atomic.h#L63 # 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_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 40715) +++ ruby_1_9_3/version.h (revision 40716) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1 #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 419 +#define RUBY_PATCHLEVEL 420 #define RUBY_RELEASE_DATE "2013-05-14" #define RUBY_RELEASE_YEAR 2013 Property changes on: ruby_1_9_3 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r40163 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/