* generic/tcl.h: Moved Tcl_Mutex, etc. macros above the inclusion

of tclDecls.h to avoid macro conflicts.

* generic/tclInt.h:
* generic/regc_color.c:
* generic/regcomp.c:
* generic/tclCmdIL.c:
* generic/tclCmdAH.c:
* generic/tclIOCmd.c:
* generic/tclParse.c:
* generic/tclStringObj.c:
* unix/tclUnixNotfy.c: Cleaned up various compiler warnings,
eliminated UCHAR bugs.

* unix/tclUnixNotfy.c:
* unix/tclUnixThrd.c:
* generic/tclThreadTest.c:
* mac/tclMacThrd.c: Changed TclpCondition*() to Tcl_Condition*().

3 files changed, 14 insertions, 15 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index d253589..983b31e 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.1.2.13.2.1 1999/03/08 20:14:15 stanton Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.1.2.13.2.2 1999/03/09 02:37:19 stanton Exp $
 
 # Current Tcl version;  used in various names.
 
@@ -259,7 +259,7 @@ TCLTEST_OBJS = tclTestInit.o tclTest.o tclTestObj.o tclTestProcBodyObj.o \
 XTTEST_OBJS = tclTest.o tclTestObj.o tclUnixTest.o tclXtNotify.o \
 	tclXtTest.o xtTestInit.o
 
-GENERIC_OBJS = regcomp.o regexec.o regfree.o regerror.o \
+GENERIC_OBJS = regcomp.o regexec.o regfree.o regerror.o tclAlloc.o \
 	tclAsync.o tclBasic.o tclBinary.o \
 	tclCkalloc.o tclClock.o tclCmdAH.o tclCmdIL.o tclCmdMZ.o \
 	tclCompCmds.o tclCompExpr.o tclCompile.o tclDate.o tclEncoding.o \
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 5862156..3104504 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -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: tclUnixNotfy.c,v 1.1.2.6 1998/12/12 01:37:04 lfb Exp $
+ * RCS: @(#) $Id: tclUnixNotfy.c,v 1.1.2.6.2.1 1999/03/09 02:37:19 stanton Exp $
  */
 
 #include "tclInt.h"
@@ -216,7 +216,7 @@ Tcl_InitNotifier()
      */
 
     while (triggerPipe < 0) {
-	TclpConditionWait(&notifierCV, &notifierMutex, NULL);
+	Tcl_ConditionWait(&notifierCV, &notifierMutex, NULL);
     }
 
     Tcl_MutexUnlock(&notifierMutex);
@@ -262,7 +262,7 @@ Tcl_FinalizeNotifier(clientData)
 	    panic("Tcl_FinalizeNotifier: notifier pipe not initialized");
 	}
 	close(triggerPipe);
-	TclpConditionWait(&notifierCV, &notifierMutex, NULL);
+	Tcl_ConditionWait(&notifierCV, &notifierMutex, NULL);
     }
 
     /*
@@ -304,7 +304,7 @@ Tcl_AlertNotifier(clientData)
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *) clientData;
     Tcl_MutexLock(&notifierMutex);
     tsdPtr->eventReady = 1;
-    TclpConditionNotify(&tsdPtr->waitCV);
+    Tcl_ConditionNotify(&tsdPtr->waitCV);
     Tcl_MutexUnlock(&notifierMutex);
 #endif
 }
@@ -604,7 +604,6 @@ Tcl_WaitForEvent(timePtr)
     struct timeval timeout, *timeoutPtr;
     int bit, index, mask;
 #ifdef TCL_THREADS
-    Tcl_Time polltime;
     int waitForFiles;
 #else
     int numFound;
@@ -682,7 +681,7 @@ Tcl_WaitForEvent(timePtr)
     memset((VOID *) tsdPtr->readyMasks, 0, 3*MASK_SIZE*sizeof(fd_mask));
 
     if (!tsdPtr->eventReady) {
-        TclpConditionWait(&tsdPtr->waitCV, &notifierMutex, timePtr);
+        Tcl_ConditionWait(&tsdPtr->waitCV, &notifierMutex, timePtr);
     }
     tsdPtr->eventReady = 0;
 
@@ -838,7 +837,7 @@ NotifierThreadProc(clientData)
      * Signal any threads that are waiting.
      */
 
-    TclpConditionNotify(&notifierCV);
+    Tcl_ConditionNotify(&notifierCV);
     Tcl_MutexUnlock(&notifierMutex);
 
     /*
@@ -908,7 +907,7 @@ NotifierThreadProc(clientData)
 	    }
             if (found || (tsdPtr->pollState & POLL_DONE)) {
                 tsdPtr->eventReady = 1;
-		TclpConditionNotify(&tsdPtr->waitCV);
+		Tcl_ConditionNotify(&tsdPtr->waitCV);
 		if (tsdPtr->onList) {
 		    /*
 		     * Remove the ThreadSpecificData structure of this thread
@@ -957,7 +956,7 @@ NotifierThreadProc(clientData)
     close(receivePipe);
     Tcl_MutexLock(&notifierMutex);
     triggerPipe = -1;
-    TclpConditionNotify(&notifierCV);
+    Tcl_ConditionNotify(&notifierCV);
     Tcl_MutexUnlock(&notifierMutex);
 }
 #endif
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index 3032430..86aba51 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -590,7 +590,7 @@ TclpFinalizeThreadDataKey(keyPtr)
 /*
  *----------------------------------------------------------------------
  *
- * TclpConditionWait --
+ * Tcl_ConditionWait --
  *
  *	This procedure is invoked to wait on a condition variable.
  *	The mutex is automically released as part of the wait, and
@@ -610,7 +610,7 @@ TclpFinalizeThreadDataKey(keyPtr)
  */
 
 void
-TclpConditionWait(condPtr, mutexPtr, timePtr)
+Tcl_ConditionWait(condPtr, mutexPtr, timePtr)
     Tcl_Condition *condPtr;	/* Really (pthread_cond_t **) */
     Tcl_Mutex *mutexPtr;	/* Really (pthread_mutex_t **) */
     Tcl_Time *timePtr;		/* Timeout on waiting period */
@@ -649,7 +649,7 @@ TclpConditionWait(condPtr, mutexPtr, timePtr)
 /*
  *----------------------------------------------------------------------
  *
- * TclpConditionNotify --
+ * Tcl_ConditionNotify --
  *
  *	This procedure is invoked to signal a condition variable.
  *
@@ -666,7 +666,7 @@ TclpConditionWait(condPtr, mutexPtr, timePtr)
  */
 
 void
-TclpConditionNotify(condPtr)
+Tcl_ConditionNotify(condPtr)
     Tcl_Condition *condPtr;
 {
     pthread_cond_t *pcondPtr = *((pthread_cond_t **)condPtr);