Separate the ifdefs for INTPTR_TYPE and UINTPTR_TYPE in sqliteInt.h. (CVS 1875)

FossilOrigin-Name: 4e7953c13fd2cb32e5c97737c4b2f99b1b1edc9b

diff --git a/manifest b/manifest
index 6bead15b58b0f3fd06dee0106e6da9a3cfd7c386..01711af2fb6f7a144123856abd7df6bd2b4135db 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\smemory\sleak\swhen\sthe\sauxiliary\sdata\sof\sa\sdatabase\sstructure\sis\sused.\s(CVS\s1874)
-D 2004-08-01T03:52:18
+C Separate\sthe\sifdefs\sfor\sINTPTR_TYPE\sand\sUINTPTR_TYPE\sin\ssqliteInt.h.\s(CVS\s1875)
+D 2004-08-04T14:29:23
 F Makefile.in 4a5e570a9e2d35b09c31b3cf01b78cea764ade4b
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -60,7 +60,7 @@ F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c cbed45f4af76ad7fdfc0a0df6878b2b3827ae1d4
 F src/shell.c 7371f0a4b1c1aaed336176dfcc6e6742c138b263
 F src/sqlite.h.in c340a12b4d0521efb474dd000fba3bdfb18d76da
-F src/sqliteInt.h 691d584330cadab3801280caa49eb479fe2446a3
+F src/sqliteInt.h 7a8dec83364d940372507ca4d4ff0c96bce05300
 F src/table.c 4521c278892f60e4d630788c0ea5cf4db1e75c49
 F src/tclsqlite.c cece44ee1d4427185e4ac85ddec79f31ac26965a
 F src/test1.c 9389fafc3c3a2a3b6bf4f7cffe1c7e8ccdd0be38
@@ -240,7 +240,7 @@ F www/tclsqlite.tcl 06a86cba4d7fc88e2bcd633b57702d3d16abebb5
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P b56afe640f7f3f2837120e3dd923c529c4a3123a
-R 06ca33779ad15e09f523b9428a32a8d5
+P 7ecff04a6153aa200233e6c0846a65e0213c3179
+R bb7c51783ef3b73e24fdafb73590b839
 U drh
-Z a9f8d3489b4ba1e9ece699045aac4ce2
+Z 5df9b4b7e13f1695014f4ed2b1c6b64b

diff --git a/manifest.uuid b/manifest.uuid
index 81bbdcac5d13f5c0bf9a17f8dfbb63303c474fb1..4326682dd46481ff8310e84fe06122229ae5c808 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7ecff04a6153aa200233e6c0846a65e0213c3179
\ No newline at end of file
+4e7953c13fd2cb32e5c97737c4b2f99b1b1edc9b
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 8842832326874f5a81a313550c5a1b14585bf2f7..a1463bf32d32626221e38b1b2471242cd9d76c17 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.312 2004/07/26 12:24:23 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.313 2004/08/04 14:29:23 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -114,9 +114,14 @@
 #ifndef INTPTR_TYPE
 # if SQLITE_PTR_SZ==4
 #   define INTPTR_TYPE int
-#   define UINTPTR_TYPE unsigned int
 # else
 #   define INTPTR_TYPE sqlite_int64
+# endif
+#endif
+#ifndef UINTPTR_TYPE
+# if SQLITE_PTR_SZ==4
+#   define UINTPTR_TYPE unsigned int
+# else
 #   define UINTPTR_TYPE sqlite_uint64
 # endif
 #endif