diff --git a/manifest b/manifest
index 6e7833ee1e..1f5b47bef5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Convert\sthe\shint\sexpression\sof\sthe\sCursorHint\sopcode\sinto\sa\sstring\sfor\ndisplay\sby\sEXPLAIN.
-D 2015-08-13T21:32:41.246
+C Fix\sa\sharmless\scompiler\swarning.
+D 2015-08-13T21:38:09.150
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2fc9ca6bf5949d415801c007ed3004a4bdb7c380
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -340,7 +340,7 @@ F src/shell.c b1f91e60918df3a68efad1e3a11696b9a7e23d23
 F src/sqlite.h.in 447ead0a6b3293206f04a0896553955d07cfb4b9
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h a0b948ebc89bac13941254641326a6aa248c2cc4
-F src/sqliteInt.h b12cb9c5e277061a79d6f81ca3d8bb6ef1d5c6f1
+F src/sqliteInt.h ea5885ac6df1de2444846d0a79c6252e2fa444ab
 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
 F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
 F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@ -1375,7 +1375,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P be254715b5f56900e57ed57a179ca8d7bb68685d
-R 35eb49e0fc9f5ab493d2ccd36c0aabff
+P 206884718782331a7aaacc2c811e4e9d2effae91
+R f5dc80740c0c127675d801f8d87e4c24
 U drh
-Z c266af41e61c50699b530df37cf4ff5a
+Z b21aee07c484f8ec189fb6d6a7ed9bda
diff --git a/manifest.uuid b/manifest.uuid
index ad135c79ee..b4945b51a0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-206884718782331a7aaacc2c811e4e9d2effae91
\ No newline at end of file
+608ab4ac1911d5f32a17ea043bd5f0748598691d
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 4f0055c452..f1658d12f2 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3405,7 +3405,9 @@ int sqlite3ExprIsConstant(Expr*);
 int sqlite3ExprIsConstantNotJoin(Expr*);
 int sqlite3ExprIsConstantOrFunction(Expr*, u8);
 int sqlite3ExprIsTableConstant(Expr*,int);
+#ifdef SQLITE_ENABLE_CURSOR_HINTS
 int sqlite3ExprContainsSubquery(Expr*);
+#endif
 int sqlite3ExprIsInteger(Expr*, int*);
 int sqlite3ExprCanBeNull(const Expr*);
 int sqlite3ExprNeedsNoAffinityChange(const Expr*, char);