commit f39d9588291fb3fabc9fa23047ebabca12a413e7
author drh <drh@noemail.net> Wed Mar 19 20:42:13 2008 +0000
committer drh <drh@noemail.net> Wed Mar 19 20:42:13 2008 +0000
tree 09da1c7ce8d233f17cd85ba41b28f44a6da855d3
parent 8257f0c1da35aaecedc368f27eb970f908f82f3a

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

src/delete.c

diff --git a/src/delete.c b/src/delete.c
index 94839c9..dd97f18 100644
--- 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 @@
   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

src/insert.c

diff --git a/src/insert.c b/src/insert.c
index 52e5b3a..9a2cb56 100644
--- 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 @@
   }
 }
 #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

src/update.c

diff --git a/src/update.c b/src/update.c
index 5c21ab8..f6faca2 100644
--- 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 @@
   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