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

1 files changed, 0 insertions, 6 deletions

diff --git a/string.c b/string.c
index fd240bc07a..572a22a5fe 100644
--- a/string.c
+++ b/string.c
@@ -2158,12 +2158,6 @@ rb_str_prepend(VALUE str, VALUE str2)
 }
 
 st_index_t
-rb_memhash(const void *ptr, long len)
-{
-    return st_hash(ptr, len, rb_hash_start((st_index_t)len));
-}
-
-st_index_t
 rb_str_hash(VALUE str)
 {
     int e = ENCODING_GET(str);