From: drh <drh@noemail.net>
Date: Fri, 10 Oct 2014 18:09:52 +0000 (+0000)
Subject: Changes to enable compiling using VC6.
X-Git-Tag: version-3.8.7~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab993380a27226883381d21d5401d76df7fccaee;p=thirdparty%2Fsqlite.git

Changes to enable compiling using VC6.

FossilOrigin-Name: 9ee5686ab3b0bca8cabdf455c75bd9410cdc5378
---

diff --git a/manifest b/manifest
index 258e0ade2b..fd3281f6c5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\susing\sthe\s-config\soption\sto\sreleasetest.tcl,\sdefault\sthe\stesting\stype\nto\s"fulltest"\sif\sit\sis\snot\sspecified\son\sthe\scommand\sline.
-D 2014-10-10T17:47:00.230
+C Changes\sto\senable\scompiling\susing\sVC6.
+D 2014-10-10T18:09:52.113
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -232,7 +232,7 @@ F src/shell.c 18ee8bbe9502d8848072dc2eddd1ea09254ba494
 F src/sqlite.h.in 4a5e5158c189d2bcd45c7c4607c2c0eb6d25c153
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
-F src/sqliteInt.h 6ac5e34a590ad7ea22af91d190bdb212b12107be
+F src/sqliteInt.h c417a25e2369f705b651897a2f1cc8da0e6aa1c4
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 961d5926e5a8fda611d385ec22c226b8635cd1cb
 F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
@@ -282,7 +282,7 @@ F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb
 F src/test_vfs.c f84075a388527892ff184988f43b69ce69b8083c
 F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
-F src/threads.c 22dded4283dc4b25422f6444cdcb8d6b1ea0b5ff
+F src/threads.c 60c9d400abf17ccdc8767cdc6af90b9c5acf58bd
 F src/tokenize.c cc9016e5007fc5e76789079616d2f26741bcc689
 F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
 F src/update.c 729f6f18fc27740591d085e1172cebe311144bf0
@@ -1203,7 +1203,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d479e32be205f6cd0474f002282eae6eec613f36
-R 931ed67b9f38d30c31761dd7af84265b
+P cf291cbe9f49396f03cfca39c2e892f27f750107
+R 9d22f3b27c328e6d3cb49e4853606989
 U drh
-Z 3cea3f1ee45c98cf88d87a6691b7a96c
+Z 2221fbb0fe2956ed5002647d0de83cc0
diff --git a/manifest.uuid b/manifest.uuid
index 29909b01ca..8d12ba50f3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cf291cbe9f49396f03cfca39c2e892f27f750107
\ No newline at end of file
+9ee5686ab3b0bca8cabdf455c75bd9410cdc5378
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 7998638c7f..e648430353 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -159,7 +159,7 @@
 */
 #if defined(__GNUC__)
 #  define SQLITE_NOINLINE  __attribute__((noinline))
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) && _MSC_VER>=1310
 #  define SQLITE_NOINLINE  __declspec(noinline)
 #else
 #  define SQLITE_NOINLINE
diff --git a/src/threads.c b/src/threads.c
index 213a129c99..6d39042fd9 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -105,7 +105,7 @@ int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){
 
 /* A running thread */
 struct SQLiteThread {
-  uintptr_t tid;           /* The thread handle */
+  void *tid;               /* The thread handle */
   unsigned id;             /* The thread identifier */
   void *(*xTask)(void*);   /* The routine to run as a thread */
   void *pIn;               /* Argument to xTask */
@@ -153,7 +153,7 @@ int sqlite3ThreadCreate(
   }else{
     p->xTask = xTask;
     p->pIn = pIn;
-    p->tid = _beginthreadex(0, 0, sqlite3ThreadProc, p, 0, &p->id);
+    p->tid = (void*)_beginthreadex(0, 0, sqlite3ThreadProc, p, 0, &p->id);
     if( p->tid==0 ){
       memset(p, 0, sizeof(*p));
     }