summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2001-06-02 19:53:10 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2001-06-02 19:53:10 (GMT)
commit25bc1ee03b4f7f3ae4fb8c066b18ec7e94c5e1f1 (patch)
treede4a58baaff3a67f1b51cb5abf8fc87697b5b146
parente885ba7b95ffafb0a95e1875c7ce6ad0fe792fab (diff)
downloadtcl-25bc1ee03b4f7f3ae4fb8c066b18ec7e94c5e1f1.zip
tcl-25bc1ee03b4f7f3ae4fb8c066b18ec7e94c5e1f1.tar.gz
tcl-25bc1ee03b4f7f3ae4fb8c066b18ec7e94c5e1f1.tar.bz2
change from HEAD
-rw-r--r--S4-0-2/ChangeLog6
-rw-r--r--generic/tclExecute.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/S4-0-2/ChangeLog b/S4-0-2/ChangeLog
index 0d203f0..e0e5cd5 100644
--- a/S4-0-2/ChangeLog
+++ b/S4-0-2/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-02 Miguel Sofer <msofer@users.sourceforge.net>
+
+ * generic/tclExecute.c: (TclExecuteByteCode): Added two casts to
+ INST_STR_CMP implementation to get rid of a couple warnings from
+ the SUNWspro C compiler. (change of 2001-05-30 in HEAD)
+
2001-05-22 Miguel Sofer <msofer@users.sourceforge.net>
* generic/tclExecute.c: removed Tcl_Duplicate_Obj from INST_DUP
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index fe92451..6394f5f 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -17,7 +17,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.21.2.8 2001/05/22 15:54:35 msofer Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.21.2.9 2001/06/02 19:53:10 msofer Exp $
*/
#include "tclInt.h"
@@ -1981,8 +1981,8 @@ TclExecuteByteCode(interp, codePtr)
*/
if ((valuePtr->typePtr == &tclByteArrayType) &&
(value2Ptr->typePtr == &tclByteArrayType)) {
- s1 = Tcl_GetByteArrayFromObj(valuePtr, &s1len);
- s2 = Tcl_GetByteArrayFromObj(value2Ptr, &s2len);
+ s1 = (char *) Tcl_GetByteArrayFromObj(valuePtr, &s1len);
+ s2 = (char *) Tcl_GetByteArrayFromObj(value2Ptr, &s2len);
iResult = memcmp(s1, s2,
(size_t) ((s1len < s2len) ? s1len : s2len));
} else {