Comment and preprocessor macro cleanup.

FossilOrigin-Name: c0809b5e32c2ca0600098447a573e718eaeb319f

diff --git a/manifest b/manifest
index 5b1c91fed18d2fe2dccfee1782bae6e8d8a99aaf..7ff295a15b311d7c4452c07c219d4a574ea6f53d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\smain.mk,\salways\srecompile\svdbe.o\sand\sparse.o\sfirst,\ssince\schanges\sto\seither\nparse.y\sor\svdbe.c\swill\scause\sall\sfiles\sto\sbe\srecompiled\sand\sif\sthere\sare\nsyntax\serrors\sin\svdbe.c\sor\sparse.y\swe\swant\sto\shit\sthem\searly\sin\sthe\scompile\nprocess.
-D 2013-07-29T13:51:54.129
+C Comment\sand\spreprocessor\smacro\scleanup.
+D 2013-07-29T15:54:06.213
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -221,7 +221,7 @@ F src/shell.c 52f975eae87c8338c4dfbf4c2842d2a0971f01fd
 F src/sqlite.h.in d6a7523d6795317aac574fccc67d9df25253771c
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
-F src/sqliteInt.h 6d3115f774aa3e87737f9447c9c0cea992c5bdbf
+F src/sqliteInt.h 89b52c053ebafa76f03bab4f0c8ee1e390eb7489
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -268,7 +268,7 @@ F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 F src/test_syscall.c 16dbe79fb320fadb5acd7a0a59f49e52ab2d2091
 F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
 F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb
-F src/test_vfs.c 12d9931f65acde64961523b6f420ba7cd057fbd7
+F src/test_vfs.c e72f555ef7a59080f898fcf1a233deb9eb704ea9
 F src/test_vfstrace.c 34b544e80ba7fb77be15395a609c669df2e660a2
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/tokenize.c e0e8fd3cb90a88451f6b6425726c84747b6b20d7
@@ -1103,7 +1103,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 8bcbb33fd0a970e16a920e1d35571836dbb9ba50
-R ac65f68c338ba95f0df6e2b9636e977b
+P a94a66d10f160ee79fffa8527655c2cc4a0c7103
+R 40bf3454255194f171fc87e9079822c4
 U drh
-Z 6ff5447967bf3da3ba994ae07683c81d
+Z 077c159fd8ed6b7ef4b9adb97eba8746

diff --git a/manifest.uuid b/manifest.uuid
index 75982a66eb6395bb6f7c5eba2c02bca081e9f3a2..a931d8409be5d14fad17dcc152866287203c0319 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a94a66d10f160ee79fffa8527655c2cc4a0c7103
\ No newline at end of file
+c0809b5e32c2ca0600098447a573e718eaeb319f
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 35a7778a92fab851b482fc8ded513538c42929f9..795740978f1765a93825a7612c3067b306aa25bb 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -161,9 +161,6 @@
 ** will cause HeapValidate to be called.  If heap validation should fail, an
 ** assertion will be triggered.
 **
-** (Historical note:  There used to be several other options, but we've
-** pared it down to just these three.)
-**
 ** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
 ** the default.
 */
@@ -201,20 +198,13 @@
 #  define _XOPEN_SOURCE 600
 #endif
 
-/*
-** The TCL headers are only needed when compiling the TCL bindings.
-*/
-#if defined(SQLITE_TCL) || defined(TCLSH)
-# include <tcl.h>
-#endif
-
 /*
 ** NDEBUG and SQLITE_DEBUG are opposites.  It should always be true that
 ** defined(NDEBUG)==!defined(SQLITE_DEBUG).  If this is not currently true,
 ** make it true by defining or undefining NDEBUG.
 **
-** Setting NDEBUG makes the code smaller and run faster by disabling the
-** number assert() statements in the code.  So we want the default action
+** Setting NDEBUG makes the code smaller and faster by disabling the
+** assert() statements in the code.  So we want the default action
 ** to be for NDEBUG to be set and NDEBUG to be undefined only if SQLITE_DEBUG
 ** is set.  Thus NDEBUG becomes an opt-in rather than an opt-out
 ** feature.
@@ -284,7 +274,7 @@
 ** In other words, ALWAYS and NEVER are added for defensive code.
 **
 ** When doing coverage testing ALWAYS and NEVER are hard-coded to
-** be true and false so that the unreachable code then specify will
+** be true and false so that the unreachable code they specify will
 ** not be counted as untested code.
 */
 #if defined(SQLITE_COVERAGE_TEST)
@@ -308,16 +298,12 @@
 /*
 ** The macro unlikely() is a hint that surrounds a boolean
 ** expression that is usually false.  Macro likely() surrounds
-** a boolean expression that is usually true.  GCC is able to
-** use these hints to generate better code, sometimes.
+** a boolean expression that is usually true.  These hints could,
+** in theory, be used by the compiler to generate better code, but
+** currently they are just comments for human readers.
 */
-#if defined(__GNUC__) && 0
-# define likely(X)    __builtin_expect((X),1)
-# define unlikely(X)  __builtin_expect((X),0)
-#else
-# define likely(X)    !!(X)
-# define unlikely(X)  !!(X)
-#endif
+#define likely(X)    (X)
+#define unlikely(X)  (X)
 
 #include "sqlite3.h"
 #include "hash.h"

diff --git a/src/test_vfs.c b/src/test_vfs.c
index 8b6b530bb64c53c6bfd141c2916637d8805b0e0b..613b0fce77482b74116d23e9f59d0899ae56e078 100644 (file)
--- a/src/test_vfs.c
+++ b/src/test_vfs.c
@@ -28,6 +28,7 @@
 
 #include "sqlite3.h"
 #include "sqliteInt.h"
+#include <tcl.h>
 
 typedef struct Testvfs Testvfs;
 typedef struct TestvfsShm TestvfsShm;