summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorJoe Mistachkin <joe@mistachkin.com>2003-05-13 10:16:16 (GMT)
committerJoe Mistachkin <joe@mistachkin.com>2003-05-13 10:16:16 (GMT)
commit89e5a5f995907e072bff4bebc780df6ab8e4d55f (patch)
tree1f0a1e95565618ea475808d459aed5e188a41f47 /generic
parentabbcb0c269fc4339825f49ec99f9799d03f0340e (diff)
downloadtcl-89e5a5f995907e072bff4bebc780df6ab8e4d55f.zip
tcl-89e5a5f995907e072bff4bebc780df6ab8e4d55f.tar.gz
tcl-89e5a5f995907e072bff4bebc780df6ab8e4d55f.tar.bz2
fix for [Bug 732477]
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.decls4
-rw-r--r--generic/tclDecls.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls
index a6ed026..7fcb4c6 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.96 2003/05/13 08:40:30 das Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.97 2003/05/13 10:16:16 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 fce6fef..e8eb34a 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.94 2003/04/05 01:26:11 dkf Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.95 2003/05/13 10:16:16 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));
@@ -2077,7 +2077,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 */