Permalink
Browse files

* ruby_atomic.h: renamed from atomic.h to avoid header file name conf…

…lict

  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
  • Loading branch information...
1 parent c4e1ece commit 05a05cc62b7668dc9806b94fda6aea95116cee81 ngoto committed Nov 9, 2012
Showing with 12 additions and 4 deletions.
  1. +8 −0 ChangeLog
  2. +1 −1 common.mk
  3. +1 −1 gc.c
  4. 0 atomic.h → ruby_atomic.h
  5. +1 −1 signal.c
  6. +1 −1 vm_core.h
View
@@ -1,3 +1,11 @@
+Sat Nov 10 00:49:26 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.
+
Sat Nov 10 00:46:57 2012 Naohisa Goto <ngotogenome@gmail.com>
* atomic.h: Revert r37491 which is a temporary workaroud.
View
@@ -610,7 +610,7 @@ RUBY_H_INCLUDES = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \
ENCODING_H_INCLUDES= {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h
ID_H_INCLUDES = {$(VPATH)}id.h
VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}thread_$(THREAD_MODEL).h \
- {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}atomic.h \
+ {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}ruby_atomic.h \
$(ID_H_INCLUDES)
addr2line.$(OBJEXT): {$(VPATH)}addr2line.c {$(VPATH)}addr2line.h {$(VPATH)}config.h
View
@@ -22,7 +22,7 @@
#include "internal.h"
#include "gc.h"
#include "constant.h"
-#include "atomic.h"
+#include "ruby_atomic.h"
#include <stdio.h>
#include <setjmp.h>
#include <sys/types.h>
File renamed without changes.
View
@@ -16,7 +16,7 @@
#include <signal.h>
#include <stdio.h>
#include <errno.h>
-#include "atomic.h"
+#include "ruby_atomic.h"
#if defined(__native_client__) && defined(NACL_NEWLIB)
# include "nacl/signal.h"
View
@@ -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"

0 comments on commit 05a05cc

Please sign in to comment.