diff options
| author | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-06 15:00:44 +0000 |
|---|---|---|
| committer | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-06 15:00:44 +0000 |
| commit | f70a7cd20f5087867d0d6f61c9df180e6eccdf23 (patch) | |
| tree | 45ac7fe08facec65b4a242bf73ed2a15cacc8243 | |
| parent | c4d8cc4eae6ae3ae10576a8396864baed3292b70 (diff) | |
* 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/trunk@40163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | ruby_atomic.h | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Sat Apr 6 23:46:54 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] + Sat Apr 6 23:40:40 2013 Tanaka Akira <akr@fsij.org> * lib/resolv.rb: Support LOC resources. diff --git a/configure.in b/configure.in index c6d8d83612..9b28e2b1fe 100644 --- a/configure.in +++ b/configure.in @@ -994,7 +994,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 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 diff --git a/ruby_atomic.h b/ruby_atomic.h index 135a8c7e79..4a53e60824 100644 --- a/ruby_atomic.h +++ b/ruby_atomic.h @@ -64,7 +64,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; |