Make SrcList.nSrc a signed quantity to avoid problems on AIX. (CVS 1795)

FossilOrigin-Name: 41526d098dcae6def4940cd464d0e1e673c6abb5

diff --git a/manifest b/manifest
index a69e617c1bfb82ffa2d6ced3f74ca7b6c36566af..2fc9e335472914694854450878655b6b65f7bb89 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\sreturn\stype\son\ssqliteStrICmp()\swhen\sargument\sstrings\sdiffer.\nTicket\s#804.\s(CVS\s1793)
-D 2004-07-15T13:08:41
+C Make\sSrcList.nSrc\sa\ssigned\squantity\sto\savoid\sproblems\son\sAIX.\s(CVS\s1795)
+D 2004-07-15T13:37:05
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -49,7 +49,7 @@ F src/random.c 775913e0b7fbd6295d21f12a7bd35b46387c44b2
 F src/select.c 3833e2b64cc6d249385ee44e13bf49c9ae5b903d
 F src/shell.c 920af040d3a33ea8919c82cee45b424ad841cee0
 F src/sqlite.h.in 35bec264dfb4965bbfeb7e75221f8658f210c30d
-F src/sqliteInt.h 235ce244b62bb26cc9ab394fb7a0724dd4e65c83
+F src/sqliteInt.h 3e9203f16d12baf3a364fae9d64903d813651abd
 F src/table.c eea34544be947e4939ba9e46391d5da998f90b84
 F src/tclsqlite.c 2daaaa41378fbaf167905363197e1d44464b6eb6
 F src/test1.c 4ae20bc125b1a7d7824cccca55d538d81f0b4949
@@ -189,7 +189,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P a4a2570822f13ece2174438ef8f8a6175aaa4a6b
-R 11b3fc0309baf367a4705eba00f7d356
+P 296528b281025d86650cf0e4c17e75c296e03310
+R a87120f7da504d521f6270175df033a6
 U drh
-Z 234cdaf95f692135439de7fcb69939b6
+Z a7ca373e4e0423373db283aef372ee6a

diff --git a/manifest.uuid b/manifest.uuid
index b0b4076b842af4a39e76599b39e36c7ab8af4cb2..29921fda35c9b049c0eb2e3f5d4a234c20fbce7b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-296528b281025d86650cf0e4c17e75c296e03310
\ No newline at end of file
+41526d098dcae6def4940cd464d0e1e673c6abb5
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 4c2b6434005a3035e64473cdc0e50902961e8690..c8c7e9c962f14e0a0f3ca87ea7571d61ffc6cc6c 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.220 2004/02/25 13:47:33 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.220.2.1 2004/07/15 13:37:05 drh Exp $
 */
 #include "config.h"
 #include "sqlite.h"
@@ -102,6 +102,9 @@
 #ifndef UINT16_TYPE
 # define UINT16_TYPE unsigned short int
 #endif
+#ifndef INT16_TYPE
+# define INT16_TYPE short int
+#endif
 #ifndef UINT8_TYPE
 # define UINT8_TYPE unsigned char
 #endif
@@ -117,6 +120,7 @@
 #endif
 typedef UINT32_TYPE u32;           /* 4-byte unsigned integer */
 typedef UINT16_TYPE u16;           /* 2-byte unsigned integer */
+typedef INT16_TYPE i16;            /* 2-byte signed integer */
 typedef UINT8_TYPE u8;             /* 1-byte unsigned integer */
 typedef UINT8_TYPE i8;             /* 1-byte signed integer */
 typedef INTPTR_TYPE ptr;           /* Big enough to hold a pointer */
@@ -762,8 +766,8 @@ struct IdList {
 ** now be identified by a database name, a dot, then the table name: ID.ID.
 */
 struct SrcList {
-  u16 nSrc;        /* Number of tables or subqueries in the FROM clause */
-  u16 nAlloc;      /* Number of entries allocated in a[] below */
+  i16 nSrc;        /* Number of tables or subqueries in the FROM clause */
+  i16 nAlloc;      /* Number of entries allocated in a[] below */
   struct SrcList_item {
     char *zDatabase;  /* Name of database holding this table */
     char *zName;      /* Name of the table */