From a55c8deabf14074e1db8d5974a28a950f59496cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Fri, 11 Aug 2000 13:44:14 +0200
Subject: [PATCH] Bugfix.
Rev: src/pike_memory.c:1.77
---
src/pike_memory.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/pike_memory.c b/src/pike_memory.c
index 7099295bef..855d4db488 100644
--- a/src/pike_memory.c
+++ b/src/pike_memory.c
@@ -10,7 +10,7 @@
#include "pike_macros.h"
#include "gc.h"
-RCSID("$Id: pike_memory.c,v 1.76 2000/08/10 18:57:08 nilsson Exp $");
+RCSID("$Id: pike_memory.c,v 1.77 2000/08/11 11:44:14 grubba Exp $");
/* strdup() is used by several modules, so let's provide it */
#ifndef HAVE_STRDUP
@@ -168,7 +168,7 @@ void reorder(char *memory, INT32 nitems, INT32 size,INT32 *order)
size_t hashmem(const unsigned char *a, size_t len, size_t mlen)
{
- unsigned INT32 ret;
+ size_t ret;
ret = 9248339*len;
if(len<mlen)
@@ -220,17 +220,7 @@ size_t hashmem(const unsigned char *a, size_t len, size_t mlen)
}
}
#else
- for(
-#if SIZEOF_CHAR_P == 4
- mlen >>= 3;
-#else /* sizeof(char *) != 4 */
-#if SIZEOF_CHAR_P == 8
- mlen >>= 4;
-#else /* sizeof(char *) != 8 */
- mlen /= 2*sizeof(size_t);
-#endif /* sizeof(char *) == 8 */
-#endif /* sizeof(char *) == 4 */
- --mlen >= 0;)
+ for(mlen >>= 3; mlen--;)
{
register size_t t1,t2;
t1= *(a++);
--
GitLab