From dfc112202d9f58cb29b2df7dfffd82b26fd8104b Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 14 Nov 2012 11:27:00 +0000 Subject: 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 --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index c9ef64111e..0cf3a125a3 100644 --- a/common.mk +++ b/common.mk @@ -591,7 +591,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 {$(VPATH)}vm_opts.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) array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \ -- cgit v1.2.3