Change all legacy instances of "#if SQLITE_DEBUG" to "#ifdef SQLITE_DEBUG" for

consistency.

FossilOrigin-Name: 670f10b24230863688270d12ac519609ade2302b

diff --git a/manifest b/manifest
index fbd6c3cbf1fec83d1587f5f19ba624278de1a99f..2ceff8b1f91a414eb85a96cbacab429629612168 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypos\sin\susing\sthe\sMSVC_VERSION\smacro.
-D 2017-02-13T13:26:33.213
+C Change\sall\slegacy\sinstances\sof\s"#if\sSQLITE_DEBUG"\sto\s"#ifdef\sSQLITE_DEBUG"\sfor\nconsistency.
+D 2017-02-13T13:35:55.526
 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 067a6766f800cc8d72845ab61f8de4ffe8f3fc99
@@ -337,17 +337,17 @@ F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
-F src/btree.c 9fe65ab418d99e80289f024016b5e5e74c3059dd
+F src/btree.c 3ae66974881e74df9909093818b4c3428f8d7982
 F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
 F src/btreeInt.h cd55d39d9916270837a88c12e701047cba0729b0
 F src/build.c 9e799f1edd910dfa8a0bc29bd390d35d310596af
 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a
+F src/ctime.c a9984df73898c042a5cfc8f9d8e7723d02bc35c9
 F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c 0d9d5549d42e79ce4d82ff1db1e6c81e36d2f67c
-F src/expr.c 4748f51a680ded80332aca51cc51548c60758fe9
+F src/expr.c 38bd92fcbd86b3904bfa29e477412e374b7df5a2
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae
 F src/func.c c67273e1ec08abbdcc14c189892a3ff6eeece86b
@@ -360,7 +360,7 @@ F src/insert.c 444354c23d4d140a57d6eb46f34e376a7f8f62e8
 F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 F src/loadext.c a68d8d1d14cf7488bb29dc5311cb1ce9a4404258
 F src/main.c e207b81542d13b9f13d61e78ca441f9781f055b0
-F src/malloc.c f345c60d093d6c6cf451b99a7344a123b1a70fd9
+F src/malloc.c d0a1474236486165bcb349af82e2a6560178bf7b
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c fd7cd6fe21d46fe0a4186367dd8dc26d87b787eb
 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@ -384,7 +384,7 @@ F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c ff1232b3088a39806035ecfac4fffeb22717d80b
 F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
 F src/parse.y 591704fce84f814d9a3642774c1f011d38f4149c
-F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
+F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 F src/pragma.c 7831956012f5d764761fbd023e59b0ffc08f5e8d
@@ -461,11 +461,11 @@ F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 3d2ce209a89b95cf35bffa16440f57368576e2ee
 F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
-F src/vdbe.c e7b1e860140f1d1803c6f4176b1e8f3801f3a290
+F src/vdbe.c 16f378640570c24442fd7191b136b5d6380f5c7b
 F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
 F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
 F src/vdbeapi.c 3e4a8893feeb78620f4aac4ac5b85d92255b97e1
-F src/vdbeaux.c b9a36e530e6525ca9d9a685bc7b1d01fa77b5cf8
+F src/vdbeaux.c 4122458d33318ab039c4b5da1ca4e7c9221c38e4
 F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
 F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
 F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
@@ -1555,8 +1555,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 c447441cff1884d6fe5f0a76d64b3e7d908584a1
-Q +25ebadd096ce98fd0f9fab809969d34b958794f6
-R 0d77a6b89e0c4cc810773e50b9f58357
+P f3b65926b1f439adb95e3bbce8e58785b8cf8427
+R 9a737f02698a8160ed54e0df3f0a03b5
 U drh
-Z 66e01577a77088f99ecc22522d190a03
+Z 858958ba65336814a070740bd151ce33

diff --git a/manifest.uuid b/manifest.uuid
index e47a2c37d8cb79d77fdb01e01e635f97320d78a3..897adb27e8c6248a4d2e354870e935eba9e412a5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f3b65926b1f439adb95e3bbce8e58785b8cf8427
\ No newline at end of file
+670f10b24230863688270d12ac519609ade2302b
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index de553423b8847ff23b58c2ce3ec8218314c7a2e8..e78ffef1bec7e277d2c55782ba39e51084c9d64c 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -4776,7 +4776,7 @@ static int moveToChild(BtCursor *pCur, u32 newPgno){
                         pCur, pCur->curPagerFlags);
 }
 
-#if SQLITE_DEBUG
+#ifdef SQLITE_DEBUG
 /*
 ** Page pParent is an internal (non-leaf) tree page. This function 
 ** asserts that page number iChild is the left-child if the iIdx'th
@@ -6163,7 +6163,7 @@ static int fillInCell(
   ** Use a call to btreeParseCellPtr() to verify that the values above
   ** were computed correctly.
   */
-#if SQLITE_DEBUG
+#ifdef SQLITE_DEBUG
   {
     CellInfo info;
     pPage->xParseCell(pPage, pCell, &info);

diff --git a/src/ctime.c b/src/ctime.c
index 969bbc73d2f2931ff5de10c5914f327d1199a58e..3db3192095a771606bd798ce5245cc7034ba240a 100644 (file)
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -57,7 +57,7 @@ static const char * const azCompileOpt[] = {
 #if SQLITE_COVERAGE_TEST
   "COVERAGE_TEST",
 #endif
-#if SQLITE_DEBUG
+#ifdef SQLITE_DEBUG
   "DEBUG",
 #endif
 #if SQLITE_DEFAULT_LOCKING_MODE

diff --git a/src/expr.c b/src/expr.c
index 6a1a9288a16a3b1ba3bea0b24ac6f8d8c1e6ed9b..505e56a2720913449fd03880bc296a830b34c4e3 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -3272,7 +3272,7 @@ void sqlite3ExprCodeGetColumnToReg(
 void sqlite3ExprCacheClear(Parse *pParse){
   int i;
 
-#if SQLITE_DEBUG
+#ifdef SQLITE_DEBUG
   if( pParse->db->flags & SQLITE_VdbeAddopTrace ){
     printf("CLEAR\n");
   }

diff --git a/src/malloc.c b/src/malloc.c
index e7714aa103a46b226e1d41bc9e92571b0c07929e..0fdc8d73ffca7c145d348ed47d92b26c55c9221a 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -418,7 +418,7 @@ int sqlite3MallocSize(void *p){
 int sqlite3DbMallocSize(sqlite3 *db, void *p){
   assert( p!=0 );
   if( db==0 || !isLookaside(db,p) ){
-#if SQLITE_DEBUG
+#ifdef SQLITE_DEBUG
     if( db==0 ){
       assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) );
       assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
@@ -479,7 +479,7 @@ void sqlite3DbFree(sqlite3 *db, void *p){
     }
     if( isLookaside(db, p) ){
       LookasideSlot *pBuf = (LookasideSlot*)p;
-#if SQLITE_DEBUG
+#ifdef SQLITE_DEBUG
       /* Trash all content in the buffer being freed */
       memset(p, 0xaa, db->lookaside.sz);
 #endif

diff --git a/src/pcache.c b/src/pcache.c
index 0fc44c54992be09e7be848a75abde11f5777f58c..dc7d00f306c6504581a9cc493dc02810eece0671 100644 (file)
--- a/src/pcache.c
+++ b/src/pcache.c
@@ -104,7 +104,7 @@ struct PCache {
 **
 **          assert( sqlite3PcachePageSanity(pPg) );
 */
-#if SQLITE_DEBUG
+#ifdef SQLITE_DEBUG
 int sqlite3PcachePageSanity(PgHdr *pPg){
   PCache *pCache;
   assert( pPg!=0 );

diff --git a/src/vdbe.c b/src/vdbe.c
index cb8a039abbafc01e9aaa6b59f39131d87cafff6a..7f286b2c6d3a068511d6f28a863fab7e48547c20 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2198,7 +2198,7 @@ case OP_Compare: {
   assert( pKeyInfo!=0 );
   p1 = pOp->p1;
   p2 = pOp->p2;
-#if SQLITE_DEBUG
+#ifdef SQLITE_DEBUG
   if( aPermute ){
     int k, mx = 0;
     for(k=0; k<n; k++) if( aPermute[k]>mx ) mx = aPermute[k];

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 68f6a5acc84196d391e7c6ac0e75200c542d995d..cf062cf01d7cda4b631872e7558d9f62c31c4743 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -3562,7 +3562,7 @@ void sqlite3VdbeRecordUnpack(
   p->nField = u;
 }
 
-#if SQLITE_DEBUG
+#ifdef SQLITE_DEBUG
 /*
 ** This function compares two index or table record keys in the same way
 ** as the sqlite3VdbeRecordCompare() routine. Unlike VdbeRecordCompare(),
@@ -3667,7 +3667,7 @@ debugCompareEnd:
 }
 #endif
 
-#if SQLITE_DEBUG
+#ifdef SQLITE_DEBUG
 /*
 ** Count the number of fields (a.k.a. columns) in the record given by
 ** pKey,nKey.  The verify that this count is less than or equal to the