* generic/tclInt.h: Replaced Kevin Kenny's temporary

        * generic/tclThreadAlloc.c:     fix for Bug 945447 with a cleaner,
        more permanent replacement.

3 files changed, 11 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 5a93a0f..4cdeca7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-30  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tclInt.h:		Replaced Kevin Kenny's temporary
+	* generic/tclThreadAlloc.c:	fix for Bug 945447 with a cleaner,
+	more permanent replacement.  
+
 2004-04-30  Kevin B. Kenny   <kennykb@acm.org>
 
 	* generic/tclThreadAlloc.c: Added a temporary (or so I hope!)
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 1c7b74c..ff89229 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclInt.h,v 1.154 2004/04/25 20:16:31 dgp Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.155 2004/04/30 20:06:43 dgp Exp $
  */
 
 #ifndef _TCLINT
@@ -2175,6 +2175,9 @@ EXTERN void	TclDbInitNewObj _ANSI_ARGS_((Tcl_Obj *objPtr));
 
 EXTERN Tcl_Obj *TclThreadAllocObj _ANSI_ARGS_((void));
 EXTERN void TclThreadFreeObj _ANSI_ARGS_((Tcl_Obj *));
+EXTERN Tcl_Mutex *TclpNewAllocMutex _ANSI_ARGS_((void));
+EXTERN void *TclpGetAllocCache _ANSI_ARGS_((void));
+EXTERN void TclpSetAllocCache _ANSI_ARGS_((void *));
 
 #  define TclAllocObjStorage(objPtr) \
        (objPtr) = TclThreadAllocObj()
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 4f8905f..70a7980 100755
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -11,21 +11,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclThreadAlloc.c,v 1.10 2004/04/30 17:45:31 kennykb Exp $
+ * RCS: @(#) $Id: tclThreadAlloc.c,v 1.11 2004/04/30 20:06:44 dgp Exp $
  */
 
 #if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
 
 #include "tclInt.h"
 
-#ifdef WIN32
-#include "tclWinInt.h"
-#else
-extern Tcl_Mutex *TclpNewAllocMutex(void);
-extern void *TclpGetAllocCache(void);
-extern void TclpSetAllocCache(void *);
-#endif
-
 /*
  * If range checking is enabled, an additional byte will be allocated
  * to store the magic number at the end of the requested memory.