diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | gc.c | 2 | ||||
| -rw-r--r-- | ruby_atomic.h (renamed from atomic.h) | 0 | ||||
| -rw-r--r-- | signal.c | 2 | ||||
| -rw-r--r-- | vm_core.h | 2 |
6 files changed, 12 insertions, 4 deletions
@@ -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. @@ -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 @@ -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> diff --git a/atomic.h b/ruby_atomic.h index f4dd5db38a..f4dd5db38a 100644 --- a/atomic.h +++ b/ruby_atomic.h @@ -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" @@ -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" |