From: drh <drh@noemail.net>
Date: Fri, 20 Apr 2007 12:22:01 +0000 (+0000)
Subject: Remove the ARRAYSIZE macro from where.c to avoid a name conflict with
X-Git-Tag: version-3.6.10~2307
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cad651e02245f093a024c0e960c7c64a568ef598;p=thirdparty%2Fsqlite.git

Remove the ARRAYSIZE macro from where.c to avoid a name conflict with
microsoft header files.  Ticket #2311 (CVS 3863)

FossilOrigin-Name: 9389a15f35f854c88440e365d85b48af3ff76b00
---

diff --git a/manifest b/manifest
index c496817e29..288c1160bf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sbug\sin\sfts2\shandling\sof\sOR\squeries.\s\sWhen\sone\sdoclist\sends\sbefore\nthe\sother,\sthe\scode\spotentially\stries\sto\sread\spast\sthe\send\sof\sthe\ndoclist.\s\shttp://www.sqlite.org/cvstrac/tktview?tn=2309\s(CVS\s3862)
-D 2007-04-19T18:36:32
+C Remove\sthe\sARRAYSIZE\smacro\sfrom\swhere.c\sto\savoid\sa\sname\sconflict\swith\nmicrosoft\sheader\sfiles.\s\sTicket\s#2311\s(CVS\s3863)
+D 2007-04-20T12:22:02
 F Makefile.in 8cab54f7c9f5af8f22fd97ddf1ecfd1e1860de62
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -132,7 +132,7 @@ F src/vdbeaux.c ef59545f53f90394283f2fd003375d3ebbf0bd6e
 F src/vdbefifo.c 3ca8049c561d5d67cbcb94dc909ae9bb68c0bf8f
 F src/vdbemem.c 981a113405bd9b80aeb71fe246a2f01708e8a8f7
 F src/vtab.c 89a0d5f39c1beba65a77fdb4d507b831fc5e6baf
-F src/where.c fce0dad6b230eb7ea844e8b8667c074d07e3fdd5
+F src/where.c 0f17b7bed2ce50ba450e8f436d5ec8b420c4ab3f
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/all.test a8dca528354b70a52f130e1bb33dedc6848862a1
@@ -459,7 +459,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 5ad645339b2a3a280651447dceda67645ff8e96d
-R 5fff061f297d6b4e1ba7e515635fa7f0
-U shess
-Z d55534ed741d514c5d3c3f8f87370bea
+P dfac6082e8ffc52a85c4906107a7fc0e1aa9df82
+R 70a329ef96824c4ac0f20c0e9d368dfe
+U drh
+Z 1b6107bb1679b972c0e210e23338040a
diff --git a/manifest.uuid b/manifest.uuid
index e660f4bb29..62a1a932ca 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dfac6082e8ffc52a85c4906107a7fc0e1aa9df82
\ No newline at end of file
+9389a15f35f854c88440e365d85b48af3ff76b00
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 3327e81c36..2737b150a1 100644
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.246 2007/04/06 01:04:40 drh Exp $
+** $Id: where.c,v 1.247 2007/04/20 12:22:02 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -25,11 +25,6 @@
 */
 #define BMS  (sizeof(Bitmask)*8)
 
-/*
-** Determine the number of elements in an array.
-*/
-#define ARRAYSIZE(X)  (sizeof(X)/sizeof(X[0]))
-
 /*
 ** Trace output macros
 */
@@ -195,7 +190,7 @@ static void whereClauseInit(
   pWC->pParse = pParse;
   pWC->pMaskSet = pMaskSet;
   pWC->nTerm = 0;
-  pWC->nSlot = ARRAYSIZE(pWC->aStatic);
+  pWC->nSlot = ArraySize(pWC->aStatic);
   pWC->a = pWC->aStatic;
 }
 
@@ -310,7 +305,7 @@ static Bitmask getMask(ExprMaskSet *pMaskSet, int iCursor){
 ** array will never overflow.
 */
 static void createMask(ExprMaskSet *pMaskSet, int iCursor){
-  assert( pMaskSet->n < ARRAYSIZE(pMaskSet->ix) );
+  assert( pMaskSet->n < ArraySize(pMaskSet->ix) );
   pMaskSet->ix[pMaskSet->n++] = iCursor;
 }