Fix problems with the way the IsHiddenColumn() macro is defined.

FossilOrigin-Name: 126b998cf163dcdd5a222634f1e929f04db3c700

diff --git a/manifest b/manifest
index 4c993920d864f3d77078c6c48bb4189170fff67b..d831f3f7cd780cd78ba84cd25f24072d2d1b351b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sVACUUM\sand\s__hidden__\scolumns.
-D 2015-11-19T18:09:05.518
+C Fix\sproblems\swith\sthe\sway\sthe\sIsHiddenColumn()\smacro\sis\sdefined.
+D 2015-11-19T18:11:20.451
 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@ -344,7 +344,7 @@ F src/shell.c f0f59ea60ad297f671b7ae0fb957a736ad17c92c
 F src/sqlite.h.in fa62718f73553f06b2f2e362fd09ccb4e1cbb626
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
-F src/sqliteInt.h d8dc20e7b0e12cf5fd85f43a2abad99eb6f66d9b
+F src/sqliteInt.h 25d0792e6d355a27975dc7c49c4514b3f6eb2294
 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
 F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
 F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@ -1404,7 +1404,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 28df5dc4a9569f388af2ee0d1f016afbea132277
-R 223c84fbd92f4a39a8e2bec8517a666e
-U dan
-Z 81a0a463975756dda288ce492d814635
+P 13995756ad8b80568aa2f74387788a8cab1123ef
+R 7d5fbb49b212de9edfd34eb075dc8992
+U drh
+Z bc25bafe8827ab2ba48c52405ca8c198

diff --git a/manifest.uuid b/manifest.uuid
index 6e20668ab2feb83ff264a6a602ba654dd056aa77..3e5e242be018e490c76c6031ca86513c4df878bb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-13995756ad8b80568aa2f74387788a8cab1123ef
\ No newline at end of file
+126b998cf163dcdd5a222634f1e929f04db3c700
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index ea1ccda88b05e8b8de39aac4fc0219e8cc98806b..2e1adb82e611cc055239a6aada1b9a688efdcebe 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1698,7 +1698,6 @@ struct Table {
 #  define IsVirtual(X)      (((X)->tabFlags & TF_Virtual)!=0)
 #else
 #  define IsVirtual(X)      0
-#  define IsHiddenColumn(X) 0
 #endif
 
 /*
@@ -1710,7 +1709,7 @@ struct Table {
 #if defined(SQLITE_ENABLE_HIDDEN_COLUMNS)
 #  define IsHiddenColumn(X)         (((X)->colFlags & COLFLAG_HIDDEN)!=0)
 #  define IsOrdinaryHiddenColumn(X) (((X)->colFlags & COLFLAG_HIDDEN)!=0)
-#elif !defined(SQLITE_OMIT_VIRTUAL)
+#elif !defined(SQLITE_OMIT_VIRTUALTABLE)
 #  define IsHiddenColumn(X)         (((X)->colFlags & COLFLAG_HIDDEN)!=0)
 #  define IsOrdinaryHiddenColumn(X) 0
 #else