diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-14 11:27:00 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-14 11:27:00 +0000 |
commit | dfc112202d9f58cb29b2df7dfffd82b26fd8104b (patch) | |
tree | 26cf6af020a041541e75dafac5723419eda35d9a /vm_core.h | |
parent | c185d9cd225b332a13f8e3227b0c30a7996e59e8 (diff) |
merge revision(s) 37604:
* ruby_atomic.h: renamed from atomic.h to avoid header file name
conflict on Solaris 10. [ruby-dev:46414] [Bug #7287]
* gc.c, signal.c, vm_core.h, common.mk: reflect the rename from
atomic.h to ruby_atomic.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_core.h')
-rw-r--r-- | vm_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -22,7 +22,7 @@ #include "vm_opts.h" #include "id.h" #include "method.h" -#include "atomic.h" +#include "ruby_atomic.h" #if defined(_WIN32) #include "thread_win32.h" |