OriginalBugID: 3933 Bug
Version: 8.3b1
SubmitDate: '1999-12-23'
LastModified: '2000-04-25'
Severity: LOW
Status: Closed
Submitter: techsupp
ChangedBy: hobbs
RelatedBugIDs: 3954 3955 3932
OS: Windows 2000
FixedDate: '2000-10-25'
ClosedDate: '2000-04-25'
Name:
David Gravereaux
Comments:
Please excuse the errors in the last 2 bug reports and disregard them for this.
Patch:
Index: generic/tclInt.h
===================================================================
RCS file: /cvsroot/tcl/generic/tclInt.h,v
retrieving revision 1.39
diff -c -r1.39 tclInt.h
*** tclInt.h 1999/12/12 22:46:42 1.39
--- tclInt.h 1999/12/23 06:22:30
***************
*** 792,797 ****
--- 792,799 ----
#ifdef MAC_TCL
typedef pascal void *(Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData));
+ #elif defined __WIN32__
+ typedef unsigned (__stdcall * Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData));
#else
typedef void (Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData));
#endif
Index: generic/tclThreadTest.c
===================================================================
RCS file: /cvsroot/tcl/generic/tclThreadTest.c,v
retrieving revision 1.5
diff -c -r1.5 tclThreadTest.c
*** tclThreadTest.c 1999/12/21 23:58:04 1.5
--- tclThreadTest.c 1999/12/23 06:22:32
***************
*** 128,133 ****
--- 133,140 ----
#ifdef MAC_TCL
static pascal void *NewThread _ANSI_ARGS_((ClientData clientData));
+ #elif defined __WIN32__
+ static unsigned __stdcall NewThread _ANSI_ARGS_((ClientData clientData));
#else
static void NewThread _ANSI_ARGS_((ClientData clientData));
#endif
***************
*** 407,412 ****
--- 419,426 ----
*/
#ifdef MAC_TCL
static pascal void *
+ #elif defined __WIN32__
+ static unsigned __stdcall
#else
static void
#endif
***************
*** 468,473 ****
--- 482,489 ----
Tcl_ExitThread(result);
#ifdef MAC_TCL
return NULL;
+ #elif defined __WIN32__
+ return 0;
#endif
}
Index: win/tclWinThrd.c
===================================================================
RCS file: /cvsroot/tcl/win/tclWinThrd.c,v
retrieving revision 1.5
diff -c -r1.5 tclWinThrd.c
*** tclWinThrd.c 1999/12/22 00:00:17 1.5
--- tclWinThrd.c 1999/12/23 06:22:34
***************
*** 122,129 ****
{
unsigned long code;
! code = _beginthreadex(NULL, 0, (LPTHREAD_START_ROUTINE) proc,
! (void *)clientData, 0, (unsigned *)idPtr);
if (code == 0) {
return TCL_ERROR;
} else {
--- 122,129 ----
{
unsigned long code;
! code = _beginthreadex(NULL, 0, proc, (void *)clientData, 0,
! (unsigned *)idPtr);
if (code == 0) {
return TCL_ERROR;
} else {
Index: win/tclWinSock.c
===================================================================
RCS file: /cvsroot/tcl/win/tclWinSock.c,v
retrieving revision 1.18
diff -c -r1.18 tclWinSock.c
*** tclWinSock.c 1999/12/09 14:44:11 1.18
--- tclWinSock.c 1999/12/23 06:22:39
***************
*** 207,213 ****
int direction, ClientData *handlePtr));
static int WaitForSocketEvent _ANSI_ARGS_((SocketInfo *infoPtr,
int events, int *errorCodePtr));
! static DWORD WINAPI SocketThread _ANSI_ARGS_((LPVOID arg));
/*
* This structure describes the channel type structure for TCP socket
--- 207,213 ----
int direction, ClientData *handlePtr));
static int WaitForSocketEvent _ANSI_ARGS_((SocketInfo *infoPtr,
int events, int *errorCodePtr));
! static unsigned __stdcall SocketThread _ANSI_ARGS_((LPVOID arg));
/*
* This structure describes the channel type structure for TCP socket
***************
*** 2117,2123 ****
*----------------------------------------------------------------------
*/
! static DWORD WINAPI
SocketThread(LPVOID arg)
{
MSG msg;
--- 2117,2123 ----
*----------------------------------------------------------------------
*/
! static unsigned __stdcall
SocketThread(LPVOID arg)
{
MSG msg;
PatchFiles:
generic/tclInt.h generic/tclThreadTest.c win/tclWinThrd.c
win/tclWinSock.c
This first changes were made, but the SocketThread return decl
is still the same (and doesn't complain) in 8.3.1.
-- 04/25/2000 hobbs
