summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-14 11:27:00 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-14 11:27:00 +0000
commitdfc112202d9f58cb29b2df7dfffd82b26fd8104b (patch)
tree26cf6af020a041541e75dafac5723419eda35d9a /ChangeLog
parentc185d9cd225b332a13f8e3227b0c30a7996e59e8 (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 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a6ff9090d9..ed13397a30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Nov 14 20:20:46 2012 Naohisa Goto <ngotogenome@gmail.com>
+
+ * 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.
+
Tue Nov 13 18:13:10 2012 Narihiro Nakamura <authornari@gmail.com>
* gc.c: Use the non-recursive marking instead of recursion. The