From: shane <shane@noemail.net>
Date: Mon, 1 Sep 2008 22:06:23 +0000 (+0000)
Subject: Added  (_MSC_VER>1200) to SQLITE_DEPRECATED and SQLITE_EXPERIMENTAL defines since... 
X-Git-Tag: version-3.6.10~521
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8b34b56306427c144a2a07acb0396076972850f;p=thirdparty%2Fsqlite.git

Added  (_MSC_VER>1200) to SQLITE_DEPRECATED and SQLITE_EXPERIMENTAL defines since __declspec(deprecated) isn't supported by VC 6 or earlier.  Ticket #3347. (CVS 5656)

FossilOrigin-Name: 4bcaed08a1b50aef9f4f8a447a35d8678df92050
---

diff --git a/manifest b/manifest
index 7a3c10ae96..dab220c174 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sprototype\sfor\sand\scalls\sto\ssqlite3MaterializeView()\sif\s\s!defined(SQLITE_OMIT_VIEW)\s&&\s!defined(SQLITE_OMIT_TRIGGER).\s(CVS\s5655)
-D 2008-09-01T21:59:43
+C Added\s\s(_MSC_VER>1200)\sto\sSQLITE_DEPRECATED\sand\sSQLITE_EXPERIMENTAL\sdefines\ssince\s__declspec(deprecated)\sisn't\ssupported\sby\sVC\s6\sor\searlier.\s\sTicket\s#3347.\s(CVS\s5656)
+D 2008-09-01T22:06:23
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -147,7 +147,7 @@ F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a
 F src/resolve.c a6abf83125bce0c80ba04acc27c3565155ad305c
 F src/select.c eec7c5f28a0c75fdd8500630435af176bba73219
 F src/shell.c d83b578a8ccdd3e0e7fef4388a0887ce9f810967
-F src/sqlite.h.in 0031454ccb163b191daab7f7151d9d68af8b26c9
+F src/sqlite.h.in 81c37dcbd5bb1b1a5f6cdd96a67e82e6a0c3d1da
 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
 F src/sqliteInt.h 4ac6c25d217307c1d95800ee50b29292806693e0
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
@@ -630,7 +630,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P bdeefe37602f8b0cd7c63a8c1e52de319cc51bea
-R 272b24068639c4b760bf09f5a099c551
+P 9cf484fc17944ffa14335e391112d82d2390d116
+R 8d8bb8fb8868373b20efefc5087e7a3e
 U shane
-Z 48ff9b71cc8628400c81fb5d5b62d0f5
+Z b4739fa06590f36964521c309e7e2f82
diff --git a/manifest.uuid b/manifest.uuid
index 1f420a5314..4e7c11c9b5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9cf484fc17944ffa14335e391112d82d2390d116
\ No newline at end of file
+4bcaed08a1b50aef9f4f8a447a35d8678df92050
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 0a38fed5f1..f729a97d84 100644
--- 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.395 2008/09/01 18:34:20 danielk1977 Exp $
+** @(#) $Id: sqlite.h.in,v 1.396 2008/09/01 22:06:23 shane Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -57,7 +57,7 @@ extern "C" {
 #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
   /* GCC added the deprecated attribute in version 3.1 */
   #define SQLITE_DEPRECATED __attribute__ ((deprecated))
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) && (_MSC_VER>1200) 
   #define SQLITE_DEPRECATED __declspec(deprecated)
 #else
   #define SQLITE_DEPRECATED
@@ -70,7 +70,7 @@ extern "C" {
   /* I can confirm that it does not work on version 4.1.0... */
   /* First appears in GCC docs for version 4.3.0 */
   #define SQLITE_EXPERIMENTAL __attribute__ ((warning ("is experimental")))
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) && (_MSC_VER>1200) 
   #define SQLITE_EXPERIMENTAL __declspec(deprecated("was declared experimental"))
 #else
   #define SQLITE_EXPERIMENTAL