summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--string.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 91ebd3cffa..258a86dfc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 20 03:42:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (hash): fixed typo. [ruby-dev:37791]
+
Tue Jan 20 01:15:27 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/mkconstants.rb (SOMAXCONN): defined.
diff --git a/string.c b/string.c
index f6027df076..1764d69c8a 100644
--- a/string.c
+++ b/string.c
@@ -1973,7 +1973,7 @@ hash(const unsigned char * data, int len, unsigned int h)
#else
t = (t >> sr) | (d << sl);
#endif
- h = murmur(h, t);
+ h = murmur_step(h, t);
t = d;
data += sizeof(uint32_t);
len -= sizeof(uint32_t);