From: drh <drh@noemail.net>
Date: Thu, 19 Oct 2000 15:28:40 +0000 (+0000)
Subject: fix an HPUX bug (CVS 1709)
X-Git-Tag: version-3.6.10~5916
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed5423d5aeea8d621f53ca1f6b53a0cd68cd28e5;p=thirdparty%2Fsqlite.git

fix an HPUX bug (CVS 1709)

FossilOrigin-Name: 9e91b729f0a708b08060979a4998be890b6d268d
---

diff --git a/manifest b/manifest
index 4aa8aaf2b0..cdf25eabf9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s1.0.14\s(CVS\s489)
-D 2000-10-19T15:00:00
+C fix\san\sHPUX\sbug\s(CVS\s1709)
+D 2000-10-19T15:28:41
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 0b1fdafa55e1bf4d3a4f5213544130e66ef32052
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
@@ -11,7 +11,7 @@ F src/build.c e2ceba852dc45ca899e68a042b29c3daab011575
 F src/dbbe.c 7e01384320075bf1d3e7fb54984df73435908809
 F src/dbbe.h d175a04b35ea75078274e059dcbcbf7c1262d42a
 F src/dbbegdbm.c 4ac7222afff0cf91014803f8791740b6da825a2b
-F src/dbbemem.c f151ba58e3112a75359527e84d33c66a3ca642fe
+F src/dbbemem.c 60cfc71c4d170cde66aff24ab0afc041063b1cad
 F src/delete.c 4d491eaf61b515516749c7ed68fa3b2ee8a09065
 F src/expr.c e8e350d7baa33bd9ed8701c159eaba5e912e0adb
 F src/insert.c f146f149ad2422a1dc3bfa7a1651a25940f98958
@@ -76,7 +76,7 @@ F www/opcode.tcl cb3a1abf8b7b9be9f3a228d097d6bf8b742c2b6f
 F www/sqlite.tcl cb0d23d8f061a80543928755ec7775da6e4f362f
 F www/tclsqlite.tcl ae101d5f7c07dcc59770e2a84aae09025fab2dad
 F www/vdbe.tcl bcbfc33bcdd0ebad95eab31286adb9e1bc289520
-P 8eee153078b27b56c6da7d0b7a3df25985ed051f
-R 9bb9f9623b64eb7623a7363ddbbf550c
+P 4788dc32a5c9fc3fcd08cbc43b13671c132f0c3e
+R 2390d7eef92e84e45abcc66c62f47540
 U drh
-Z 3e28ca57636181c95e5954869a69a585
+Z c8447ca735e27991e337774a5a64ac19
diff --git a/manifest.uuid b/manifest.uuid
index 966fed4a0f..3c0cc35fa2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4788dc32a5c9fc3fcd08cbc43b13671c132f0c3e
\ No newline at end of file
+9e91b729f0a708b08060979a4998be890b6d268d
\ No newline at end of file
diff --git a/src/dbbemem.c b/src/dbbemem.c
index f609e889b1..b91c87e7da 100644
--- a/src/dbbemem.c
+++ b/src/dbbemem.c
@@ -28,7 +28,7 @@
 **
 ** This file uses an in-memory hash talbe as the database backend. 
 **
-** $Id: dbbemem.c,v 1.3 2000/10/19 14:18:34 drh Exp $
+** $Id: dbbemem.c,v 1.4 2000/10/19 15:28:41 drh Exp $
 */
 #include "sqliteInt.h"
 #include <sys/stat.h>
@@ -137,7 +137,9 @@ static void ArrayClear(Array *array){
 static int ArrayHash(Datum d){
   int h = 0;
   while( d.n-- > 0 ){
-    h = (h<<9) ^ (h<<3) ^ h ^ *(((char*)d.p)++);
+    /* The funky case "*(char**)&d.p" is to work around a bug the
+    ** c89 compiler of HPUX. */
+    h = (h<<9) ^ (h<<3) ^ h ^ *((*(char**)&d.p)++);
   }
   if( h<0 ) h = -h; 
   return h;