diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-09 15:38:38 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-09 15:38:38 +0000 |
| commit | 5e45af463cca6f062a986d5e686350e17ea653bb (patch) | |
| tree | 17e8b758eaee27fa3a69598b2a32e96318cffe8b /common.mk | |
| parent | 7c9a4b2f0abea9754c4a26da65f76561f81da08f (diff) | |
merge revision(s) 37585,37587,37591,37592,37597,37599:
* random.c (rb_memhash): use siphash.
* siphash.c (sip_init_state): use union to suppress warnings by gcc
4.7.
* siphash.h: include inttypes.h only when HAVE_INTTYPES_H is defined.
* siphash.h: check configure macros before include newer headers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -671,7 +671,8 @@ proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \ process.$(OBJEXT): {$(VPATH)}process.c $(RUBY_H_INCLUDES) \ {$(VPATH)}util.h {$(VPATH)}io.h $(ENCODING_H_INCLUDES) {$(VPATH)}dln.h \ $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h -random.$(OBJEXT): {$(VPATH)}random.c $(RUBY_H_INCLUDES) +random.$(OBJEXT): {$(VPATH)}random.c $(RUBY_H_INCLUDES) \ + {$(VPATH)}siphash.c {$(VPATH)}siphash.h range.$(OBJEXT): {$(VPATH)}range.c $(RUBY_H_INCLUDES) \ $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h rational.$(OBJEXT): {$(VPATH)}rational.c $(RUBY_H_INCLUDES) {$(VPATH)}internal.h |