The GCC magic to warn about experimental interfaces does not work

on gcc version 4.1.0.  Add #ifdefs to work around this. (CVS 5552)

FossilOrigin-Name: 90cae83169de980c6548ca6b57f4c65419e8eb13

diff --git a/manifest b/manifest
index 8550fd9b5b0bfa7102d38d585a8facdf56f34313..da836ae1b61fe0afa371fb494fb9e6e1680225c4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Added\sSQLITE_EXPERIMENTAL\sand\sSQLITE_DEPRECATED\stags\sto\sAPIs\sto\stake\sadvantage\sof\scompiler\swarnings\s(with\sthe\snecessary\sfunction\sattributes.)\s\sTicket\s#3142.\s(CVS\s5551)
-D 2008-08-11T17:27:02
+C The\sGCC\smagic\sto\swarn\sabout\sexperimental\sinterfaces\sdoes\snot\swork\non\sgcc\sversion\s4.1.0.\s\sAdd\s#ifdefs\sto\swork\saround\sthis.\s(CVS\s5552)
+D 2008-08-11T18:29:38
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 2713ea64947be3b35f35d9a3158bb8299c90b019
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -144,7 +144,7 @@ F src/printf.c 2e984b2507291a7e16d89dc9bb60582904f6247d
 F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a
 F src/select.c 390d1bdde0c24f0225e369896da8e60ef2aeffbe
 F src/shell.c 4b835fe734304ac22a3385868cd3790c1e4f7aa1
-F src/sqlite.h.in e0a00bff50997f9210d8eb014b3af48f4eaafb42
+F src/sqlite.h.in ba8920c272e3ddef424bc0627cbecaec5401ae47
 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
 F src/sqliteInt.h 685b9cf6537e59e4453269b43acb33c59b566346
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
@@ -617,7 +617,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 571adab9d2215fac6ed375257a070b8ffa9d9808
-R fcfa79ccf98383011a1b0e291c0c7cff
-U shane
-Z bb732ecf52d8f084294f658ab4f24744
+P 5f4b547aba56564cebfdd442d2171c1c8c2979ba
+R 01014453b2c93908762f879c2f841d24
+U drh
+Z 930f1dc51ca1ae0466ef498973eb4fb5

diff --git a/manifest.uuid b/manifest.uuid
index e1b4af69e04f25343c5943ecd3d9564bb769136e..513b4400fdfad743923d4953fe2bb47149e33820 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5f4b547aba56564cebfdd442d2171c1c8c2979ba
\ No newline at end of file
+90cae83169de980c6548ca6b57f4c65419e8eb13
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 58185d5a539476b0f73dfd38693ac4ba17d9d5b6..1e5cb6aa9d5540b17460d2cb1bb1b38e5e8af4a1 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -30,7 +30,7 @@
 ** the version number) and changes its name to "sqlite3.h" as
 ** part of the build process.
 **
-** @(#) $Id: sqlite.h.in,v 1.389 2008/08/11 17:27:02 shane Exp $
+** @(#) $Id: sqlite.h.in,v 1.390 2008/08/11 18:29:38 drh Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -66,8 +66,9 @@ extern "C" {
 /*
 ** Add the ability to mark interfaces as experimental.
 */
-#if (__GNUC__ > 3)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
   /* GCC added the warning attribute in version 4.0 (I think) */
+  /* I can confirm that it does not work on version 4.1.0... */
   #define SQLITE_EXPERIMENTAL __attribute__ ((warning ("is experimental")))
 #elif defined(_MSC_VER)
   #define SQLITE_EXPERIMENTAL __declspec(deprecated("was declared experimental"))