From: drh <drh@noemail.net>
Date: Fri, 14 Mar 2008 19:17:54 +0000 (+0000)
Subject: Change an instance of intptr_t to sqlite3_intptr_t. (CVS 4863)
X-Git-Tag: version-3.6.10~1314
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3099e1acabf9a4a468c082d79ffcfb9ab8ac2dc9;p=thirdparty%2Fsqlite.git

Change an instance of intptr_t to sqlite3_intptr_t. (CVS 4863)

FossilOrigin-Name: 6db7186c304ed5e06afb207ce11ebc2a47e491b0
---

diff --git a/manifest b/manifest
index dafee803eb..26db418071 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Revise\sBitvec\sstruct\ssizing\sto\sprevent\sassertion\sfailure\son\s64-bit\ssystems\s(CVS\s4862)
-D 2008-03-14T13:02:08
+C Change\san\sinstance\sof\sintptr_t\sto\ssqlite3_intptr_t.\s(CVS\s4863)
+D 2008-03-14T19:17:55
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 5be94fea84f1599672e5041de03b97990baca593
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -181,7 +181,7 @@ F src/vdbeapi.c cf9fc963efae3cdf5de08e2a9718b487059c7fc5
 F src/vdbeaux.c 83e34e38706889a16fbd77fce3777390d425af79
 F src/vdbeblob.c 63c750acc7b5012479f508c0e9627372a82cb65d
 F src/vdbefifo.c a30c237b2a3577e1415fb6e288cbb6b8ed1e5736
-F src/vdbemem.c 16c924eec121a6d12b35a9f4cbef8be848427a6d
+F src/vdbemem.c 7a39ad5579e0a9e7305a8fe9a2095840f0ab8454
 F src/vtab.c 00cd16317b29495c185ff40e4b227917d5a371b2
 F src/where.c c5eaca1f2d9caa20c5c7096434ccde2be03b325c
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
@@ -623,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P e62858b9b8a12ecbad8037868d03469d27418377
-R a1f1b21a46d1ac4b2908c100a2665b2b
-U mlcreech
-Z 08450c1f5e8015ace2e676b30b546a90
+P a3c12dbe95c8fb93f5b9006bf5d2c5b933fc5e87
+R 6a03c8ba37f932ba000bf40f85f91ca9
+U drh
+Z 8e9f2258de90dc9ea109b62a14d9710e
diff --git a/manifest.uuid b/manifest.uuid
index 78d0c91e3e..55c58028af 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a3c12dbe95c8fb93f5b9006bf5d2c5b933fc5e87
\ No newline at end of file
+6db7186c304ed5e06afb207ce11ebc2a47e491b0
\ No newline at end of file
diff --git a/src/vdbemem.c b/src/vdbemem.c
index a7a0eaeda9..632151c19e 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -932,7 +932,7 @@ const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){
   }else{
     assert( (pVal->flags&MEM_Blob)==0 );
     sqlite3VdbeMemStringify(pVal, enc);
-    assert( 0==(1&(intptr_t)pVal->z) );
+    assert( 0==(1&(sqlite3_intptr_t)pVal->z) );
   }
   assert(pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) || pVal->db==0
               || pVal->db->mallocFailed );