Undefine the "isView" macro when compiling with SQLITE_OMIT_VIEW so that

the macro does not interfer with subsequent modules in the amalgamation. (CVS 4888)

FossilOrigin-Name: a42caa8f83ce19af1e569c4545ea8b2449152430

diff --git a/manifest b/manifest
index c5e90df9814e11cd955cb448df8db7133b322e16..faafb086e0c19f1300851c0933ce1cd469b061eb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\sxCurrentTime\smethod\sof\sthe\sdefault\sVFS\sinstead\sof\sstdlib\stime()\sto\nget\sthe\scurrent\stime\swhen\scompiling\swith\sSQLITE_OMIT_DATETIME_FUNCS.\s(CVS\s4887)
-D 2008-03-19T20:18:28
+C Undefine\sthe\s"isView"\smacro\swhen\scompiling\swith\sSQLITE_OMIT_VIEW\sso\sthat\nthe\smacro\sdoes\snot\sinterfer\swith\ssubsequent\smodules\sin\sthe\samalgamation.\s(CVS\s4888)
+D 2008-03-19T20:42:14
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 31182aff7a39a0a0fc41e2e68562d20d57a8b16e
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -93,14 +93,14 @@ F src/complete.c 4cf68fd75d60257524cbe74f87351b9848399131
 F src/config.h b60286b542f5284d529b659adcb9c9d25eecab20
 F src/config.h.in 343f19cacc74d4baf84a4af701b5bb44419642ff
 F src/date.c 4c026b335c529210aa17dc067b174655eda3559f
-F src/delete.c fa13c296262e89c32d28949f15be275e52d7f524
+F src/delete.c 217cd5559e00bb135dc626d4ea4ac713604729e8
 F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
 F src/expr.c 242f2f57a32f6909270e4a22ce1c810a150f5a17
 F src/fault.c 039abb45c9dbcbdf575ec2a23ae38db01bc2f7b2
 F src/func.c 00a4f0a75faaf5f85c90710d099be2fc3aaf7914
 F src/hash.c 53655c312280211444bfe23af6490a460aec2980
 F src/hash.h 031cd9f915aff27e12262cb9eb570ac1b8326b53
-F src/insert.c 3eb3d0b739eb318c7435b9da35330e2e893e3b78
+F src/insert.c 358c80592c20a61a8d5b4a127215b5e25de652f4
 F src/journal.c 807bed7a158979ac8d63953e1774e8d85bff65e2
 F src/legacy.c cb1939fdeb91ea88fb44fbd2768a10e14bc44650
 F src/limits.h 71ab25f17e35e0a9f3f6f234b8ed49cc56731d35
@@ -171,7 +171,7 @@ F src/test_tclvar.c b2d1115e4d489179d3f029e765211b2ad527ba59
 F src/test_thread.c e297dd41db0b249646e69f97d36ec13e56e8b730
 F src/tokenize.c c4b79fd48ddb709b2b8522b7d93a5a3d98168ca4
 F src/trigger.c 9bd3b6fa0beff4a02d262c96466f752ec15a7fc3
-F src/update.c 9b3be169cd2a0b065717164aa0f90aa48f34aed1
+F src/update.c d2c59643af98f966c2a04d392463089b715ca18f
 F src/utf.c 32b00d6e19010025e58f2ecb2f921d5e126771b4
 F src/util.c dba9e04121eb17ec4643d6ca231ff859452cf0e2
 F src/vacuum.c 3f34f278809bf3eb0b62ec46ff779e9c385b28f0
@@ -624,7 +624,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P bf1cecede88d2a21eb4891a343f3c19bb5416263
-R f610a182ba68c47797ba9da24c64c703
+P 73fbac7cf7b61b23831f62b996fbdd358695b473
+R ac3de7ed8140669efe87d57c5c298664
 U drh
-Z becce19e573165b3fab37f5c87a1b814
+Z 9484b5fc96550c2dac020f0ae3861dc8

diff --git a/manifest.uuid b/manifest.uuid
index da86a99e9c0efa2951c29ec94e922726e6d2dd3c..2f8380d0144f3d916907d3324cb1ec98608ce15e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-73fbac7cf7b61b23831f62b996fbdd358695b473
\ No newline at end of file
+a42caa8f83ce19af1e569c4545ea8b2449152430
\ No newline at end of file

diff --git a/src/delete.c b/src/delete.c
index 94839c9699528452c1c106b246b84857a1e7d140..dd97f18c3b9af4f257f344c0162214914bdd5fb4 100644 (file)
--- a/src/delete.c
+++ b/src/delete.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** in order to generate code for DELETE FROM statements.
 **
-** $Id: delete.c,v 1.161 2008/02/12 16:52:14 drh Exp $
+** $Id: delete.c,v 1.162 2008/03/19 20:42:14 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -537,3 +537,8 @@ int sqlite3GenerateIndexKey(
   sqlite3ReleaseTempRange(pParse, regBase, nCol+1);
   return regBase;
 }
+
+/* Make sure "isView" gets undefined in case this file becomes part of
+** the amalgamation - so that subsequent files do not see isView as a
+** macro. */
+#undef isView

diff --git a/src/insert.c b/src/insert.c
index 52e5b3a18c71c18c75a9ca0ace14c180dd536d16..9a2cb56ad44b07eab6fdff18d4ee4ce85fd578bf 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle INSERT statements in SQLite.
 **
-** $Id: insert.c,v 1.231 2008/03/06 09:58:50 mlcreech Exp $
+** $Id: insert.c,v 1.232 2008/03/19 20:42:14 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -1663,3 +1663,8 @@ static int xferOptimization(
   }
 }
 #endif /* SQLITE_OMIT_XFER_OPT */
+
+/* Make sure "isView" gets undefined in case this file becomes part of
+** the amalgamation - so that subsequent files do not see isView as a
+** macro. */
+#undef isView

diff --git a/src/update.c b/src/update.c
index 5c21ab8ec011f73fa391b3091494685c4d711446..f6faca257e7557c67c816c0cd3e1d194798ee858 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle UPDATE statements.
 **
-** $Id: update.c,v 1.171 2008/02/12 16:52:14 drh Exp $
+** $Id: update.c,v 1.172 2008/03/19 20:42:14 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -661,3 +661,8 @@ static void updateVirtualTable(
   sqlite3SelectDelete(pSelect);  
 }
 #endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+/* Make sure "isView" gets undefined in case this file becomes part of
+** the amalgamation - so that subsequent files do not see isView as a
+** macro. */
+#undef isView