Fixed postToParent() return type (Tcl_ThreadCreateType) in test_thread.c to compile...

FossilOrigin-Name: e9475abaf87c0ae2f2bbcbaf0f7ba704f9f50c5f

diff --git a/manifest b/manifest
index a3e190feb9414bff669557683a0fc46eddcdf2aa..963db70ecf4f225cc0e087128ecdfe68b98ca512 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sbuffer\ssize\sin\smd5_cmd()\sin\stest_md5.c.\s\sTest\sharness\schange\sonly.\s(CVS\s6244)
-D 2009-02-03T19:52:59
+C Fixed\spostToParent()\sreturn\stype\s(Tcl_ThreadCreateType)\sin\stest_thread.c\sto\scompile\swith\sMSVC.\s\sRemoved\sa\sfew\scompiler\swarnings.\s\sTest\sharness\schange\sonly.\s(CVS\s6245)
+D 2009-02-03T19:55:20
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -192,7 +192,7 @@ F src/test_pcache.c 29464896d9c67832e4eef916c0682b98d7283d00
 F src/test_schema.c 4b4bf7bb329326458c491b0e6facd4c8c4c5b479
 F src/test_server.c f0a403b5f699c09bd2b1236b6f69830fd6221f6b
 F src/test_tclvar.c 9e42fa59d3d2f064b7ab8628e7ab2dc8a9fe93d4
-F src/test_thread.c 2575a163700ea442b15c009e2e4b0138ddf4f869
+F src/test_thread.c adb9175c466e1f487295b5b957603fc0a88ea293
 F src/test_wsd.c c297d7d6b8a990239e1bd25935e81d612d8ae31d
 F src/tokenize.c 6987fb7f0d6a87ac53499aee568cabb05eb4bea8
 F src/trigger.c ca6d78f7c1314053800386ca64361e487774fda3
@@ -700,7 +700,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P ca650879d3168d4475a33430300a0e8ac806facf
-R 5de21d2a7e94b14f3c4a1de6111d46a7
+P c1e15717ff1b8181ff5fdc800015dadb62135e8c
+R bfe28e383cd4fc45f4b41be1d388e00a
 U shane
-Z 0304ad448d15567c96c499477c70b57e
+Z 98a8531a64be0030053f61a9ae6ebf89

diff --git a/manifest.uuid b/manifest.uuid
index b605f356e1194a3e8012de882963b57dacdf8583..0b88eb5d48d679444077ae3e6b916f3b6090e1df 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c1e15717ff1b8181ff5fdc800015dadb62135e8c
\ No newline at end of file
+e9475abaf87c0ae2f2bbcbaf0f7ba704f9f50c5f
\ No newline at end of file

diff --git a/src/test_thread.c b/src/test_thread.c
index 0f9cbbe0516f8c4563a120e0debafb3f2a1fc2b1..973ca65592fa4b5582725fd1f6af2276040ed62f 100644 (file)
--- a/src/test_thread.c
+++ b/src/test_thread.c
@@ -14,7 +14,7 @@
 ** test that sqlite3 database handles may be concurrently accessed by 
 ** multiple threads. Right now this only works on unix.
 **
-** $Id: test_thread.c,v 1.9 2009/01/19 17:40:12 drh Exp $
+** $Id: test_thread.c,v 1.10 2009/02/03 19:55:20 shane Exp $
 */
 
 #include "sqliteInt.h"
@@ -23,7 +23,10 @@
 #if SQLITE_THREADSAFE
 
 #include <errno.h>
+
+#if !defined(_MSC_VER)
 #include <unistd.h>
+#endif
 
 /*
 ** One of these is allocated for each thread created by [sqlthread spawn].
@@ -64,6 +67,7 @@ static int tclScriptEvent(Tcl_Event *evPtr, int flags){
   if( rc!=TCL_OK ){
     Tcl_BackgroundError(p->interp);
   }
+  UNUSED_PARAMETER(flags);
   return 1;
 }
 
@@ -128,7 +132,7 @@ static Tcl_ThreadCreateType tclScriptThread(ClientData pSqlThread){
   Tcl_DecrRefCount(pList);
   Tcl_DecrRefCount(pRes);
   Tcl_DeleteInterp(interp);
-  return;
+  TCL_THREAD_CREATE_RETURN;
 }
 
 /*
@@ -159,6 +163,8 @@ static int sqlthread_spawn(
   const int flags = TCL_THREAD_NOFLAGS;
 
   assert(objc==4);
+  UNUSED_PARAMETER(clientData);
+  UNUSED_PARAMETER(objc);
 
   zVarname = Tcl_GetStringFromObj(objv[2], &nVarname);
   zScript = Tcl_GetStringFromObj(objv[3], &nScript);
@@ -204,6 +210,8 @@ static int sqlthread_parent(
   SqlThread *p = (SqlThread *)clientData;
 
   assert(objc==3);
+  UNUSED_PARAMETER(objc);
+
   if( p==0 ){
     Tcl_AppendResult(interp, "no parent thread", 0);
     return TCL_ERROR;
@@ -223,6 +231,8 @@ static int sqlthread_parent(
 }
 
 static int xBusy(void *pArg, int nBusy){
+  UNUSED_PARAMETER(pArg);
+  UNUSED_PARAMETER(nBusy);
   sqlite3_sleep(50);
   return 1;             /* Try again... */
 }
@@ -247,6 +257,9 @@ static int sqlthread_open(
   char zBuf[100];
   extern void Md5_Register(sqlite3*);
 
+  UNUSED_PARAMETER(clientData);
+  UNUSED_PARAMETER(objc);
+
   zFilename = Tcl_GetString(objv[2]);
   rc = sqlite3_open(zFilename, &db);
   Md5_Register(db);
@@ -273,6 +286,9 @@ static int sqlthread_id(
 ){
   Tcl_ThreadId id = Tcl_GetCurrentThread();
   Tcl_SetObjResult(interp, Tcl_NewIntObj((int)id));
+  UNUSED_PARAMETER(clientData);
+  UNUSED_PARAMETER(objc);
+  UNUSED_PARAMETER(objv);
   return TCL_OK;
 }
 
@@ -337,6 +353,9 @@ static int clock_seconds_proc(
   Tcl_Time now;
   Tcl_GetTime(&now);
   Tcl_SetObjResult(interp, Tcl_NewIntObj(now.sec));
+  UNUSED_PARAMETER(clientData);
+  UNUSED_PARAMETER(objc);
+  UNUSED_PARAMETER(objv);
   return TCL_OK;
 }