Disable the likely() and unlikely() macros as they do not work some

older versions of GCC. (CVS 4754)

FossilOrigin-Name: e01f9ed9450d3e23fc052e1b779c7a1965e76f7e

diff --git a/manifest b/manifest
index 745be183caf41df4a4e8c7192f2ff16f2aebd256..ebb3f59619b68ef2fcd7cbf2223cbd93f01bf5fe 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Committed\schanges\sfor\sticket\s#2909\s(CVS\s4753)
-D 2008-01-28T22:09:24
+C Disable\sthe\slikely()\sand\sunlikely()\smacros\sas\sthey\sdo\snot\swork\ssome\nolder\sversions\sof\sGCC.\s(CVS\s4754)
+D 2008-01-30T16:14:23
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in bc2b5df3e3d0d4b801b824b7ef6dec43812b049b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -137,7 +137,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c ca06cb687c40a8bff6307b5fad41a0e86a0f8558
 F src/sqlite.h.in 2a7e3776534bbe6ff2cdc058f3abebe91e7e429f
 F src/sqlite3ext.h a93f59cdee3638dc0c9c086f80df743a4e68c3cb
-F src/sqliteInt.h 85e7029fa8434f184bf126d70bfef7923a392711
+F src/sqliteInt.h b006a4d887af1ce273683cc4874a506254068dbd
 F src/sqliteLimit.h ee4430f88f69bf63527967bb35ca52af7b0ccb1e
 F src/table.c 46ccf9b7892a86f57420ae7bac69ecd5e72d26b5
 F src/tclsqlite.c 9923abeffc9b3d7dad58e92b319661521f60debf
@@ -614,7 +614,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 50c9cf9bbbe858d53697b4d3a0c1ec2d63ff5b18
-R 8b0db41fa59d80ff23011e234505141b
-U aswift
-Z dd2f2ea2d6093be19d44579e5713b4f7
+P 29ce204dbf2ccd051032f23f175b5c225f209fda
+R cc07eb9e915c36744ca4f09b58864521
+U drh
+Z b8594ccaafce6f725ca393d35e09dac3

diff --git a/manifest.uuid b/manifest.uuid
index 19b7fd0500bd54f95be40a64bc56e977e6856db7..2c87c5019267bce0a70151a96a578de3804ec864 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29ce204dbf2ccd051032f23f175b5c225f209fda
\ No newline at end of file
+e01f9ed9450d3e23fc052e1b779c7a1965e76f7e
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 48b30827049179b9c073e97355bf7d0f892c7829..b9e884b1dfa9de6f987f3bda78d141f3cd4f6da2 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.657 2008/01/28 22:09:24 aswift Exp $
+** @(#) $Id: sqliteInt.h,v 1.658 2008/01/30 16:14:23 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -22,7 +22,7 @@
 ** a boolean expression that is usually true.  GCC is able to
 ** use these hints to generate better code, sometimes.
 */
-#if defined(__GNUC__)
+#if defined(__GNUC__) && 0
 # define likely(X)    __builtin_expect((X),1)
 # define unlikely(X)  __builtin_expect((X),0)
 #else