diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-14 02:23:27 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-14 02:23:27 +0000 |
| commit | fd9c5580216d9769f0b00250a05235d450c8e756 (patch) | |
| tree | af41db104511250370bd630697c0ae547d157fc1 | |
| parent | 3ba9e467ff21017f743c35d8a8b1407e2846853f (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | ruby_atomic.h | 2 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Tue May 14 11:22:33 2013 Naohisa Goto <ngotogenome@gmail.com> + + * 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@ruby-lang.org> * lib/mkmf.rb (MAIN_DOES_NOTHING): ensure symbols for tests to be diff --git a/configure.in b/configure.in index 849bb7b7d0..557f6d300a 100644 --- a/configure.in +++ b/configure.in @@ -1169,7 +1169,7 @@ AC_CHECK_HEADERS(limits.h sys/file.h sys/ioctl.h sys/syscall.h\ 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>]) diff --git a/ruby_atomic.h b/ruby_atomic.h index f4dd5db38a..920c304116 100644 --- a/ruby_atomic.h +++ b/ruby_atomic.h @@ -63,7 +63,7 @@ rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val) # 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; @@ -1,5 +1,5 @@ #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 |