From: mistachkin <mistachkin@noemail.net>
Date: Fri, 24 Aug 2018 19:04:08 +0000 (+0000)
Subject: Set SQLITE_PTRSIZE to 4 when compiling with xlc on 32-bit AIX.
X-Git-Tag: version-3.25.0~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88edc6c72a99dfe387918887b5fc38f1615969c0;p=thirdparty%2Fsqlite.git

Set SQLITE_PTRSIZE to 4 when compiling with xlc on 32-bit AIX.

FossilOrigin-Name: d158e5b12eec5b81d54c8f5902a972795423947a21d0212b6cceb2810aa6cc5c
---

diff --git a/manifest b/manifest
index de40c9d862..31a0cb26a2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Automatically\sdetect\swhen\scompiling\sfor\sAArch64\son\swindows\sand\sset\nSQLITE_BYTEORDER\sto\slittle-endian\sto\savoid\scompile-time\stesting.
-D 2018-08-23T18:56:33.848
+C Set\sSQLITE_PTRSIZE\sto\s4\swhen\scompiling\swith\sxlc\son\s32-bit\sAIX.
+D 2018-08-24T19:04:08.056
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -503,7 +503,7 @@ F src/shell.c.in 6e0aad854be738a5d0368940459399be211e9ac43aebe92bb9ed46cfe38d0e1
 F src/sqlite.h.in 82b5768e36ce796ecf93c73bd88bad99def831ce7d470138e213ac693bf4ceab
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9887b27e69c01e79c2cbe74ef73bf01af5b5703d6a7f0a4371e386d7249cb1c7
-F src/sqliteInt.h 49620c948a0022c065a9948c7f9feba56d5206da8050c83ad365fb36896a4ac7
+F src/sqliteInt.h 2a670143a4f6b7d85958bac125e4d9d8ad14f016a3582e9d7c6907d9d50b75a0
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1755,7 +1755,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1e29fd430dead641c5d92943ce81cf51b3df2f45c5a011bb2eed592efd62e056
-R 0974697392d1ab411d928a32ee000d51
-U drh
-Z 8a92905a25efce04adc91a14634c4b23
+P ef6729be85ed106212ed23a024d83b85b709207cf287436c0603a21c659f36ad
+R 0f2d8093aae9a7e4f75df1b87b4bd0e1
+U mistachkin
+Z 5d877bbacdeea49203afbcd3a16fe3ab
diff --git a/manifest.uuid b/manifest.uuid
index 96562ab211..d8f7e24ad9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ef6729be85ed106212ed23a024d83b85b709207cf287436c0603a21c659f36ad
\ No newline at end of file
+d158e5b12eec5b81d54c8f5902a972795423947a21d0212b6cceb2810aa6cc5c
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 44f90c6683..875f8fa692 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -791,7 +791,8 @@ typedef INT16_TYPE LogEst;
 # if defined(__SIZEOF_POINTER__)
 #   define SQLITE_PTRSIZE __SIZEOF_POINTER__
 # elif defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
-       defined(_M_ARM)   || defined(__arm__)    || defined(__x86)
+       defined(_M_ARM)   || defined(__arm__)    || defined(__x86)   ||    \
+      (defined(__TOS_AIX__) && !defined(__64BIT__))
 #   define SQLITE_PTRSIZE 4
 # else
 #   define SQLITE_PTRSIZE 8