From 5e45af463cca6f062a986d5e686350e17ea653bb Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 9 Nov 2012 15:38:38 +0000
Subject: 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
---
 string.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'string.c')

diff --git a/string.c b/string.c
index fd240bc07a..572a22a5fe 100644
--- a/string.c
+++ b/string.c
@@ -2157,12 +2157,6 @@ rb_str_prepend(VALUE str, VALUE str2)
     return str;
 }
 
-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)
 {
-- 
cgit v1.2.3