summaryrefslogtreecommitdiff
path: root/vm_core.h
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-09 16:05:07 +0000
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-09 16:05:07 +0000
commit05a05cc62b7668dc9806b94fda6aea95116cee81 (patch)
tree6589f0d369da796606dbd156301bb26e199a9030 /vm_core.h
parentc4e1ecef13458e9ec260bad524bacb7f3e185816 (diff)
* 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/trunk@37604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_core.h')
-rw-r--r--vm_core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm_core.h b/vm_core.h
index a50ff5287f..dd9e3872e2 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -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"