diff options
| -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 @@ +Sun Apr 14 03:00:51 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] + Sun Apr 14 02:32:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * time.c (GetTimeval): check if already initialized instance. diff --git a/configure.in b/configure.in index 3a917fc70c..b7682cfa8e 100644 --- a/configure.in +++ b/configure.in @@ -949,7 +949,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 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; @@ -1,6 +1,6 @@ #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 |