summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2004-06-22 19:41:23 (GMT)
committerKevin B Kenny <kennykb@acm.org>2004-06-22 19:41:23 (GMT)
commit468eff47d7fabe40b773ac2be2f21dd86615bc0b (patch)
tree67d8c9f94010fad42ffec1e4e158d305ba60f6cf
parent901e84c9c4eb6adb1328118aa9c8115420ab4226 (diff)
downloadtcl-468eff47d7fabe40b773ac2be2f21dd86615bc0b.zip
tcl-468eff47d7fabe40b773ac2be2f21dd86615bc0b.tar.gz
tcl-468eff47d7fabe40b773ac2be2f21dd86615bc0b.tar.bz2
* generic/tclEvent.c (NewThreadProc): Fixed broken build on
Windows caused by missing TCL_THREAD_CREATE_RETURN. * tests/stack.test (stack-3.1): Corrected nuisance error in threaded builds.
-rw-r--r--ChangeLog8
-rw-r--r--generic/tclEvent.c5
-rw-r--r--tests/stack.test14
3 files changed, 19 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d048371..597912e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-22 Kevin Kenny <kennykb@acm.org>
+
+ * generic/tclEvent.c (NewThreadProc): Fixed broken build on
+ Windows caused by missing TCL_THREAD_CREATE_RETURN.
+
+ * tests/stack.test (stack-3.1): Corrected nuisance error in
+ threaded builds.
+
2004-06-22 Zoran Vasiljevic <vasiljevic@users.sf.net>
* generic/tclEvent.c:
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 6148f84..69eac18 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -7,11 +7,12 @@
*
* Copyright (c) 1990-1994 The Regents of the University of California.
* Copyright (c) 1994-1998 Sun Microsystems, Inc.
+ * Copyright (c) 2004 by Zoran Vasiljevic.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclEvent.c,v 1.38 2004/06/22 13:08:57 vasiljevic Exp $
+ * RCS: @(#) $Id: tclEvent.c,v 1.39 2004/06/22 19:41:25 kennykb Exp $
*/
#include "tclInt.h"
@@ -1262,6 +1263,8 @@ NewThreadProc(ClientData clientData)
TclInitNotifier();
(*threadProc)(threadClientData);
+
+ TCL_THREAD_CREATE_RETURN;
}
#endif
/*
diff --git a/tests/stack.test b/tests/stack.test
index dfcf9c2..362133b 100644
--- a/tests/stack.test
+++ b/tests/stack.test
@@ -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: stack.test,v 1.16 2004/05/03 17:04:31 kennykb Exp $
+# RCS: @(#) $Id: stack.test,v 1.17 2004/06/22 19:41:25 kennykb Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
@@ -62,7 +62,6 @@ test stack-3.1 {enough room for regexp near recursion limit} \
-constraints { win } \
-setup {
set ::limit [interp recursionlimit {} 10000]
- set ::depth 0
proc a { max } {
if { [info level] < $max } {
set ::depth [info level]
@@ -71,15 +70,16 @@ test stack-3.1 {enough room for regexp near recursion limit} \
regexp {^ ?} x
}
}
+ } -body {
+ set ::depth 0
catch { a 10001 }
- incr depth -2
set depth2 $depth
- } -body {
- list [catch { a $::depth } result] \
- $result [expr { $::depth2 - $::depth }]
+ catch { a $::depth }
+ expr { $depth2 - $depth }
} -cleanup {
interp recursionlimit {} $::limit
- } -result {0 1 1}
+ rename a {}
+ } -result {1}
# cleanup
::tcltest::cleanupTests