--- a/SmallInteger.st	Tue Jul 22 17:44:51 1997 +0200
+++ b/SmallInteger.st	Tue Jul 22 17:45:25 1997 +0200
@@ -199,7 +199,7 @@
 	    product = (long long)myValue * (long long)otherValue;
 	    if ((product >= (long long)_MIN_INT) 
 	     && (product <= (long long)_MAX_INT)) {
-		RETURN ( __MKSMALLINT((int)product) );
+		RETURN ( __MKSMALLINT((INT)product) );
 	    }
 	    if (product < 0) {
 		negative = -1;
@@ -743,7 +743,7 @@
 		{
 		    extern OBJ __MKLARGEINT64();
 
-		    RETURN (__MKLARGEINT64(1, (int)(result >> 32), (int)(result & 0xFFFFFFFF)));
+		    RETURN (__MKLARGEINT64(1, (INT)(result >> 32), (INT)(result & 0xFFFFFFFF)));
 		}
 	    }
 #else
@@ -1793,18 +1793,18 @@
 			     * you are not supposed to program like this - I know what I do
 			     */
 # if TAG_INT==1
-			    int t8 = (int)(__MKSMALLINT(tmp+8));
-			    tmp = (int)(__MKSMALLINT(tmp));
-			    final = (int)(__MKSMALLINT(final));
+			    INT t8 = (INT)(__MKSMALLINT(tmp+8));
+			    tmp = (INT)(__MKSMALLINT(tmp));
+			    final = (INT)(__MKSMALLINT(final));
 # else
-			    int t8 = tmp+8;
+			    INT t8 = tmp+8;
 # endif
 
 			    for (;;) {
 
 				while (t8 <= final) {
 # if TAG_INT==1
-				    t8 += (int)(__MASKSMALLINT(8));
+				    t8 += (INT)(__MASKSMALLINT(8));
 # else
 				    t8 += 8;
 # endif
@@ -1818,55 +1818,55 @@
 				    if (InterruptPending != nil) goto interrupted1;
 	continue1:
 # if TAG_INT==1
-				    (*codeVal)(BLOCK_ARG, tmp+(int)(__MASKSMALLINT(1)) );
+				    (*codeVal)(BLOCK_ARG, tmp+(INT)(__MASKSMALLINT(1)) );
 # else
 				    (*codeVal)(BLOCK_ARG, __MKSMALLINT(tmp+1));
 # endif
 				    if (InterruptPending != nil) goto interrupted2;
 	continue2:
 # if TAG_INT==1
-				    (*codeVal)(BLOCK_ARG, tmp+(int)(__MASKSMALLINT(2)) );
+				    (*codeVal)(BLOCK_ARG, tmp+(INT)(__MASKSMALLINT(2)) );
 # else
 				    (*codeVal)(BLOCK_ARG, __MKSMALLINT(tmp+2));
 # endif
 				    if (InterruptPending != nil) goto interrupted3;
 	continue3:
 # if TAG_INT==1
-				    (*codeVal)(BLOCK_ARG, tmp+(int)(__MASKSMALLINT(3)) );
+				    (*codeVal)(BLOCK_ARG, tmp+(INT)(__MASKSMALLINT(3)) );
 # else
 				    (*codeVal)(BLOCK_ARG, __MKSMALLINT(tmp+3));
 # endif
 				    if (InterruptPending != nil) goto interrupted4;
 	continue4:
 # if TAG_INT==1
-				    (*codeVal)(BLOCK_ARG, tmp+(int)(__MASKSMALLINT(4)) );
+				    (*codeVal)(BLOCK_ARG, tmp+(INT)(__MASKSMALLINT(4)) );
 # else
 				    (*codeVal)(BLOCK_ARG, __MKSMALLINT(tmp+4));
 # endif
 				    if (InterruptPending != nil) goto interrupted5;
 	continue5:
 # if TAG_INT==1
-				    (*codeVal)(BLOCK_ARG, tmp+(int)(__MASKSMALLINT(5)) );
+				    (*codeVal)(BLOCK_ARG, tmp+(INT)(__MASKSMALLINT(5)) );
 # else
 				    (*codeVal)(BLOCK_ARG, __MKSMALLINT(tmp+5));
 # endif
 				    if (InterruptPending != nil) goto interrupted6;
 	continue6:
 # if TAG_INT==1
-				    (*codeVal)(BLOCK_ARG, tmp+(int)(__MASKSMALLINT(6)) );
+				    (*codeVal)(BLOCK_ARG, tmp+(INT)(__MASKSMALLINT(6)) );
 # else
 				    (*codeVal)(BLOCK_ARG, __MKSMALLINT(tmp+6));
 # endif
 				    if (InterruptPending != nil) goto interrupted7;
 	continue7:
 # if TAG_INT==1
-				    (*codeVal)(BLOCK_ARG, tmp+(int)(__MASKSMALLINT(7)) );
+				    (*codeVal)(BLOCK_ARG, tmp+(INT)(__MASKSMALLINT(7)) );
 # else
 				    (*codeVal)(BLOCK_ARG, __MKSMALLINT(tmp+7));
 # endif
 
 # if TAG_INT==1
-				    tmp += (int)(__MASKSMALLINT(8));
+				    tmp += (INT)(__MASKSMALLINT(8));
 # else
 				    tmp += 8;
 # endif
@@ -1875,7 +1875,7 @@
 				    if (InterruptPending != nil) __interruptL(@line);
 # if TAG_INT==1
 				    (*codeVal)(BLOCK_ARG, tmp);
-				    tmp += (int)(__MASKSMALLINT(1));
+				    tmp += (INT)(__MASKSMALLINT(1));
 # else
 				    (*codeVal)(BLOCK_ARG, __MKSMALLINT(tmp));
 				    tmp++;
@@ -2459,5 +2459,5 @@
 !SmallInteger class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.79 1997-06-18 08:42:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.80 1997-07-22 15:45:25 cg Exp $'
 ! !