Fixed compilation w/out TCL_THREADS

3 files changed, 29 insertions, 15 deletions

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index a670f78..22c6af4 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.32 2000/04/04 20:28:41 kupries Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.33 2000/04/05 00:42:19 welch Exp $
  */
 
 #ifndef _TCLDECLS
@@ -1219,10 +1219,10 @@ EXTERN int		Tcl_ProcObjCmd _ANSI_ARGS_((ClientData clientData,
 				Tcl_Interp * interp, int objc, 
 				Tcl_Obj *CONST objv[]));
 /* 391 */
-EXTERN void		Tcl_FinalizeCondition _ANSI_ARGS_((
+EXTERN void		Tcl_ConditionFinalize _ANSI_ARGS_((
 				Tcl_Condition * condPtr));
 /* 392 */
-EXTERN void		Tcl_FinalizeMutex _ANSI_ARGS_((Tcl_Mutex * mutex));
+EXTERN void		Tcl_MutexFinalize _ANSI_ARGS_((Tcl_Mutex * mutex));
 
 typedef struct TclStubHooks {
     struct TclPlatStubs *tclPlatStubs;
@@ -1681,8 +1681,8 @@ typedef struct TclStubs {
     int (*tcl_GetChannelNames) _ANSI_ARGS_((Tcl_Interp * interp)); /* 388 */
     int (*tcl_GetChannelNamesEx) _ANSI_ARGS_((Tcl_Interp * interp, char * pattern)); /* 389 */
     int (*tcl_ProcObjCmd) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 390 */
-    void (*tcl_FinalizeCondition) _ANSI_ARGS_((Tcl_Condition * condPtr)); /* 391 */
-    void (*tcl_FinalizeMutex) _ANSI_ARGS_((Tcl_Mutex * mutex)); /* 392 */
+    void (*tcl_ConditionFinalize) _ANSI_ARGS_((Tcl_Condition * condPtr)); /* 391 */
+    void (*tcl_MutexFinalize) _ANSI_ARGS_((Tcl_Mutex * mutex)); /* 392 */
 } TclStubs;
 
 #ifdef __cplusplus
@@ -3292,13 +3292,13 @@ extern TclStubs *tclStubsPtr;
 #define Tcl_ProcObjCmd \
 	(tclStubsPtr->tcl_ProcObjCmd) /* 390 */
 #endif
-#ifndef Tcl_FinalizeCondition
-#define Tcl_FinalizeCondition \
-	(tclStubsPtr->tcl_FinalizeCondition) /* 391 */
+#ifndef Tcl_ConditionFinalize
+#define Tcl_ConditionFinalize \
+	(tclStubsPtr->tcl_ConditionFinalize) /* 391 */
 #endif
-#ifndef Tcl_FinalizeMutex
-#define Tcl_FinalizeMutex \
-	(tclStubsPtr->tcl_FinalizeMutex) /* 392 */
+#ifndef Tcl_MutexFinalize
+#define Tcl_MutexFinalize \
+	(tclStubsPtr->tcl_MutexFinalize) /* 392 */
 #endif
 
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 0c0fb19..13180f8 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -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: tclStubInit.c,v 1.33 2000/04/04 20:28:43 kupries Exp $
+ * RCS: @(#) $Id: tclStubInit.c,v 1.34 2000/04/05 00:42:19 welch Exp $
  */
 
 #include "tclInt.h"
@@ -788,8 +788,8 @@ TclStubs tclStubs = {
     Tcl_GetChannelNames, /* 388 */
     Tcl_GetChannelNamesEx, /* 389 */
     Tcl_ProcObjCmd, /* 390 */
-    Tcl_FinalizeCondition, /* 391 */
-    Tcl_FinalizeMutex, /* 392 */
+    Tcl_ConditionFinalize, /* 391 */
+    Tcl_MutexFinalize, /* 392 */
 };
 
 /* !END!: Do not edit above this line. */
diff --git a/generic/tclThread.c b/generic/tclThread.c
index 69142ae..0f6e2e8 100644
--- a/generic/tclThread.c
+++ b/generic/tclThread.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: tclThread.c,v 1.4 2000/04/04 20:28:43 kupries Exp $
+ * RCS: @(#) $Id: tclThread.c,v 1.5 2000/04/05 00:42:20 welch Exp $
  */
 
 #include "tclInt.h"
@@ -43,6 +43,20 @@ static void		RememberSyncObject _ANSI_ARGS_((char *objPtr,
 static void		ForgetSyncObject _ANSI_ARGS_((char *objPtr,
 			    SyncObjRecord *recPtr));
 
+/* 
+ * Several functions are #defined to nothing in tcl.h if TCL_THREADS is not
+ * specified.  Here we undo that so the procedures are defined in the
+ * stubs table.
+ */
+#ifndef TCL_THREADS
+#undef Tcl_MutexLock
+#undef Tcl_MutexUnlock
+#undef Tcl_MutexFinalize
+#undef Tcl_ConditionNotify
+#undef Tcl_ConditionWait
+#undef Tcl_ConditionFinalize
+#endif
+
 
 /*
  *----------------------------------------------------------------------