summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Mistachkin <joe@mistachkin.com>2003-05-13 09:57:38 (GMT)
committerJoe Mistachkin <joe@mistachkin.com>2003-05-13 09:57:38 (GMT)
commitda2585a3986e433ef3d2fc269b67e6958499203f (patch)
tree916fee9988e480bc11268aa83cd81b06c59ed51d
parentb5af58fb48b98becd450e3d7b1e9753d3154d7b9 (diff)
downloadtcl-da2585a3986e433ef3d2fc269b67e6958499203f.zip
tcl-da2585a3986e433ef3d2fc269b67e6958499203f.tar.gz
tcl-da2585a3986e433ef3d2fc269b67e6958499203f.tar.bz2
fix for [Bug 732477]
-rw-r--r--ChangeLog8
-rw-r--r--generic/tcl.decls4
-rw-r--r--generic/tclDecls.h6
-rw-r--r--mac/tclMacThrd.c12
-rw-r--r--unix/tclUnixThrd.c12
-rw-r--r--win/tclWinThrd.c14
6 files changed, 32 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index eca2217..c83cdda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-13 Joe Mistachkin <joe@mistachkin.com>
+
+ * generic/tcl.decls: Changed Tcl_JoinThread parameter name from
+ * generic/tclDecls.h: "id" to "threadId". [Bug 732477]
+ * unix/tclUnixThrd.c:
+ * win/tclWinThrd.c:
+ * mac/tclMacThrd.c:
+
2003-05-13 Daniel Steffen <das@users.sourceforge.net>
* generic/tcl.decls:
diff --git a/generic/tcl.decls b/generic/tcl.decls
index ff94f2f..86151b0 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -11,7 +11,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: tcl.decls,v 1.94.2.1 2003/05/13 08:41:26 das Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.94.2.2 2003/05/13 09:57:40 mistachkin Exp $
library tcl
@@ -1457,7 +1457,7 @@ declare 411 generic {
# Introduced in 8.4a2
declare 412 generic {
- int Tcl_JoinThread(Tcl_ThreadId id, int* result)
+ int Tcl_JoinThread(Tcl_ThreadId threadId, int* result)
}
declare 413 generic {
int Tcl_IsChannelShared(Tcl_Channel channel)
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 10ff07a..37d7a4a 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclDecls.h,v 1.93 2002/08/05 15:01:04 dgp Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.93.2.1 2003/05/13 09:57:40 mistachkin Exp $
*/
#ifndef _TCLDECLS
@@ -1305,7 +1305,7 @@ EXTERN Tcl_DriverFlushProc * Tcl_ChannelFlushProc _ANSI_ARGS_((
EXTERN Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc _ANSI_ARGS_((
Tcl_ChannelType * chanTypePtr));
/* 412 */
-EXTERN int Tcl_JoinThread _ANSI_ARGS_((Tcl_ThreadId id,
+EXTERN int Tcl_JoinThread _ANSI_ARGS_((Tcl_ThreadId threadId,
int* result));
/* 413 */
EXTERN int Tcl_IsChannelShared _ANSI_ARGS_((Tcl_Channel channel));
@@ -2035,7 +2035,7 @@ typedef struct TclStubs {
Tcl_DriverGetHandleProc * (*tcl_ChannelGetHandleProc) _ANSI_ARGS_((Tcl_ChannelType * chanTypePtr)); /* 409 */
Tcl_DriverFlushProc * (*tcl_ChannelFlushProc) _ANSI_ARGS_((Tcl_ChannelType * chanTypePtr)); /* 410 */
Tcl_DriverHandlerProc * (*tcl_ChannelHandlerProc) _ANSI_ARGS_((Tcl_ChannelType * chanTypePtr)); /* 411 */
- int (*tcl_JoinThread) _ANSI_ARGS_((Tcl_ThreadId id, int* result)); /* 412 */
+ int (*tcl_JoinThread) _ANSI_ARGS_((Tcl_ThreadId threadId, int* result)); /* 412 */
int (*tcl_IsChannelShared) _ANSI_ARGS_((Tcl_Channel channel)); /* 413 */
int (*tcl_IsChannelRegistered) _ANSI_ARGS_((Tcl_Interp* interp, Tcl_Channel channel)); /* 414 */
void (*tcl_CutChannel) _ANSI_ARGS_((Tcl_Channel channel)); /* 415 */
diff --git a/mac/tclMacThrd.c b/mac/tclMacThrd.c
index 3fdafe3..dec4842 100644
--- a/mac/tclMacThrd.c
+++ b/mac/tclMacThrd.c
@@ -168,17 +168,17 @@ Tcl_CreateThread(idPtr, proc, clientData, stackSize, flags)
*/
int
-Tcl_JoinThread(id, result)
- Tcl_ThreadId id; /* Id of the thread to wait upon */
- int* result; /* Reference to the storage the result
- * of the thread we wait upon will be
- * written into. */
+Tcl_JoinThread(threadId, result)
+ Tcl_ThreadId threadId; /* Id of the thread to wait upon */
+ int* result; /* Reference to the storage the result
+ * of the thread we wait upon will be
+ * written into. */
{
if (!TclMacHaveThreads()) {
return TCL_ERROR;
}
- return TclJoinThread (id, result);
+ return TclJoinThread (threadId, result);
}
/*
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index d5f1e54..427a974 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -161,16 +161,16 @@ Tcl_CreateThread(idPtr, proc, clientData, stackSize, flags)
*/
int
-Tcl_JoinThread(id, state)
- Tcl_ThreadId id; /* Id of the thread to wait upon */
- int* state; /* Reference to the storage the result
- * of the thread we wait upon will be
- * written into. */
+Tcl_JoinThread(threadId, state)
+ Tcl_ThreadId threadId; /* Id of the thread to wait upon */
+ int* state; /* Reference to the storage the result
+ * of the thread we wait upon will be
+ * written into. */
{
#ifdef TCL_THREADS
int result;
- result = pthread_join ((pthread_t) id, (VOID**) state);
+ result = pthread_join ((pthread_t) threadId, (VOID**) state);
return (result == 0) ? TCL_OK : TCL_ERROR;
#else
return TCL_ERROR;
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index b8c045e..208f066 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinThrd.c,v 1.24.2.1 2003/04/25 20:02:39 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclWinThrd.c,v 1.24.2.2 2003/05/13 09:57:40 mistachkin Exp $
*/
#include "tclWinInt.h"
@@ -187,13 +187,13 @@ Tcl_CreateThread(idPtr, proc, clientData, stackSize, flags)
*/
int
-Tcl_JoinThread(id, result)
- Tcl_ThreadId id; /* Id of the thread to wait upon */
- int* result; /* Reference to the storage the result
- * of the thread we wait upon will be
- * written into. */
+Tcl_JoinThread(threadId, result)
+ Tcl_ThreadId threadId; /* Id of the thread to wait upon */
+ int* result; /* Reference to the storage the result
+ * of the thread we wait upon will be
+ * written into. */
{
- return TclJoinThread (id, result);
+ return TclJoinThread (threadId, result);
}
/*