summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2005-05-05 17:52:48 (GMT)
committerKevin B Kenny <kennykb@acm.org>2005-05-05 17:52:48 (GMT)
commit9c427bf1e80bcbb05860cb838266240040b91f07 (patch)
tree892b105881dfb7cf5624c5e6c3b3d4aa27f386b7
parent6f298e8ae2938056f26d538a211c23ba4b4fce19 (diff)
downloadtcl-9c427bf1e80bcbb05860cb838266240040b91f07.zip
tcl-9c427bf1e80bcbb05860cb838266240040b91f07.tar.gz
tcl-9c427bf1e80bcbb05860cb838266240040b91f07.tar.bz2
Corrected a compilation error in the --enable-threads configuration
-rw-r--r--ChangeLog5
-rw-r--r--win/tclWinThrd.c21
2 files changed, 18 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index b2f5f17..1b1b99d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-05 Kevin B. Kenny <kennykb@acm.org>
+
+ * win/tclWinThrd.c: Corrected a compilation error on the
+ --enable-threads configuration.
+
2005-05-05 Don Porter <dgp@users.sourceforge.net>
* generic/tclCompCmds.c: Factored common efficiency trick into
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index e557b84..d1f69ba 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.35 2005/04/16 08:03:04 vasiljevic Exp $
+ * RCS: @(#) $Id: tclWinThrd.c,v 1.36 2005/05/05 17:53:02 kennykb Exp $
*/
#include "tclWinInt.h"
@@ -112,6 +112,18 @@ typedef struct WinCondition {
struct ThreadSpecificData *lastPtr;
} WinCondition;
+/*
+ * Additions by AOL for specialized thread memory allocator.
+ */
+#ifdef USE_THREAD_ALLOC
+static int once;
+static DWORD key;
+
+typedef struct allocMutex {
+ Tcl_Mutex tlock;
+ CRITICAL_SECTION wlock;
+} allocMutex;
+#endif
/*
*----------------------------------------------------------------------
@@ -1044,13 +1056,6 @@ TclpFinalizeCondition(condPtr)
* Additions by AOL for specialized thread memory allocator.
*/
#ifdef USE_THREAD_ALLOC
-static int once;
-static DWORD key;
-
-typedef struct allocMutex {
- Tcl_Mutex tlock;
- CRITICAL_SECTION wlock;
-} allocMutex;
Tcl_Mutex *
TclpNewAllocMutex(void)