1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* atomic.h: add #include <sys/atomic.h> for the workaround of

Browse Source 
header file name conflict of atomic.h with /usr/include/atomic.h
  on Solaris 10. [ruby-dev:46414] [Bug #7287]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ngoto 2012-11-06 07:30:49 +00:00
parent bba3ceafa5
commit e2418e3fca
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Nov 6 16:22:30 2012 Naohisa Goto <ngotogenome@gmail.com>
* atomic.h: add #include <sys/atomic.h> for the workaround of
header file name conflict of atomic.h with /usr/include/atomic.h
on Solaris 10. [ruby-dev:46414] [Bug #7287]
Tue Nov 6 14:38:00 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* test/win32ole/test_win32ole.rb: now source encoding is UTF-8, so

1
atomic.h
View File

@ -65,6 +65,7 @@ rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val)
#elif defined(__sun)
#include <atomic.h>
#include <sys/atomic.h>
typedef unsigned int rb_atomic_t;
# define ATOMIC_SET(var, val) (void)atomic_swap_uint(&(var), (val))