diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-14 11:27:00 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-14 11:27:00 +0000 |
| commit | dfc112202d9f58cb29b2df7dfffd82b26fd8104b (patch) | |
| tree | 26cf6af020a041541e75dafac5723419eda35d9a /common.mk | |
| parent | c185d9cd225b332a13f8e3227b0c30a7996e59e8 (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 'common.mk')
| -rw-r--r-- | common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 \ |