*** empty log message ***

5 files changed, 9 insertions, 11 deletions

diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C
index b24bb0a..3b3cfb0 100644
--- a/src/bltGrPSOutput.C
+++ b/src/bltGrPSOutput.C
@@ -98,7 +98,7 @@ Blt_Ps_GetPicaFromObj(
     if (pica < 0.0) {
 	goto error;
     }
-    while ((*p != '\0') && isspace(UCHAR(*p))) {
+    while ((*p != '\0') && isspace((unsigned char)(*p))) {
 	p++;
     }
     switch (*p) {
@@ -109,7 +109,7 @@ Blt_Ps_GetPicaFromObj(
 	case 'p': p++;                       break;
 	default:  goto error;
     }
-    while ((*p != '\0') && isspace(UCHAR(*p))) {
+    while ((*p != '\0') && isspace((unsigned char)(*p))) {
 	p++;
     }
     if (*p == '\0') {
diff --git a/src/bltGrText.C b/src/bltGrText.C
index a19e71b..ab61c93 100644
--- a/src/bltGrText.C
+++ b/src/bltGrText.C
@@ -1573,7 +1573,7 @@ Blt_ComputeTextLayout(
 	 * Consume all extra spaces at end of line.  
 	 */
 
-	while ((start < end) && isspace(UCHAR(*start))) { /* INTL: ISO space */
+	while ((start < end) && isspace((unsigned char)(*start))) { /* INTL: ISO space */
 	    if (!(flags & TK_IGNORE_NEWLINES)) {
 		if ((*start == '\n') || (*start == '\r')) {
 		    break;
diff --git a/src/bltParse.C b/src/bltParse.C
index a2a7ea7..697144e 100644
--- a/src/bltParse.C
+++ b/src/bltParse.C
@@ -37,7 +37,6 @@
  */
 
 #define STATIC_STRING_SPACE	150
-#define UCHAR(c)		((unsigned char) (c))
 #define TCL_NORMAL		0x01
 #define TCL_SPACE		0x02
 #define TCL_COMMAND_END		0x04
diff --git a/src/bltVecMath.C b/src/bltVecMath.C
index dc7cf5a..a04e3c4 100644
--- a/src/bltVecMath.C
+++ b/src/bltVecMath.C
@@ -694,7 +694,7 @@ ParseString(
     } else {
 	Vector *vPtr;
 
-	while (isspace(UCHAR(*string))) {
+	while (isspace((unsigned char)(*string))) {
 	    string++;		/* Skip spaces leading the vector name. */    
 	}
 	vPtr = Blt_Vec_ParseElement(interp, valuePtr->vPtr->dataPtr, 
@@ -762,11 +762,11 @@ ParseMathFunction(
      * record for the function.
      */
     p = (char *)start;
-    while (isspace(UCHAR(*p))) {
+    while (isspace((unsigned char)(*p))) {
 	p++;
     }
     piPtr->nextPtr = p;
-    while (isalnum(UCHAR(*p)) || (*p == '_')) {
+    while (isalnum((unsigned char)(*p)) || (*p == '_')) {
 	p++;
     }
     if (*p != '(') {
@@ -838,7 +838,7 @@ NextToken(
     int result;
 
     p = piPtr->nextPtr;
-    while (isspace(UCHAR(*p))) {
+    while (isspace((unsigned char)(*p))) {
 	p++;
     }
     if (*p == '\0') {
@@ -1034,7 +1034,7 @@ NextToken(
 	} else {
 	    Vector *vPtr;
 
-	    while (isspace(UCHAR(*p))) {
+	    while (isspace((unsigned char)(*p))) {
 		p++;		/* Skip spaces leading the vector name. */    
 	    }
 	    vPtr = Blt_Vec_ParseElement(interp, valuePtr->vPtr->dataPtr, 
diff --git a/src/bltVector.C b/src/bltVector.C
index ec851f2..3bcb63a 100644
--- a/src/bltVector.C
+++ b/src/bltVector.C
@@ -59,10 +59,9 @@
 #define TRACE_ALL  (TCL_TRACE_WRITES | TCL_TRACE_READS | TCL_TRACE_UNSETS)
 
 
-#define VECTOR_CHAR(c)	((isalnum(UCHAR(c))) || \
+#define VECTOR_CHAR(c)	((isalnum((unsigned char)(c))) || \
 	(c == '_') || (c == ':') || (c == '@') || (c == '.'))
 
-
 /*
  * VectorClient --
  *