* 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
This commit is contained in:
ngoto 2013-04-06 15:00:44 +00:00
parent c4d8cc4eae
commit f70a7cd20f
3 changed files with 9 additions and 2 deletions

View File

@ -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.

View File

@ -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

View File

@ -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;