--- a/ExternalStream.st	Tue Jun 06 06:01:20 1995 +0200
+++ b/ExternalStream.st	Tue Jun 27 04:15:21 1995 +0200
@@ -24,7 +24,7 @@
 COPYRIGHT (c) 1988 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.38 1995-05-17 12:16:53 claus Exp $
+$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.39 1995-06-27 02:12:37 claus Exp $
 '!
 
 !ExternalStream primitiveDefinitions!
@@ -87,7 +87,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.38 1995-05-17 12:16:53 claus Exp $
+$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.39 1995-06-27 02:12:37 claus Exp $
 "
 !
 
@@ -803,7 +803,7 @@
     _INST(lastErrorNumber) = nil;
     if ((fp = _INST(filePointer)) != nil) {
 	if (__isSmallInteger(ioctlNumber)) {
-	    ioNum = _intVal(ioctlNumber);
+	    ioNum = __intVal(ioctlNumber);
 	    f = MKFD(fp);
 
 	    __immediateInterrupt__ = 1;
@@ -813,10 +813,10 @@
 	    __immediateInterrupt__ = 0;
 
 	    if (ret >= 0) {
-		RETURN ( _MKSMALLINT(ret) );
+		RETURN ( __MKSMALLINT(ret) );
 	    }
 	    _INST(position) = nil;
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 	}
     }
 %}.
@@ -846,23 +846,23 @@
 	if (__isSmallInteger(ioctlNumber) 
 	 && (__isSmallInteger(arg) || __isBytes(arg))) {
 	    f = MKFD(fp);
-	    ioNum = _intVal(ioctlNumber);
+	    ioNum = __intVal(ioctlNumber);
 
 	    __immediateInterrupt__ = 1;
 	    do {
 		if (__isSmallInteger(arg)) {
-		    ret = ioctl(fileno(f), ioNum, _intVal(arg));
+		    ret = ioctl(fileno(f), ioNum, __intVal(arg));
 		} else {
-		    ret = ioctl(fileno(f), ioNum, _ByteArrayInstPtr(arg)->ba_element);
+		    ret = ioctl(fileno(f), ioNum, __ByteArrayInstPtr(arg)->ba_element);
 		}
 	    } while ((ret < 0) && (errno == EINTR));
 	    __immediateInterrupt__ = 0;
 
 	    if (ret >= 0) {
-		RETURN ( _MKSMALLINT(ret) );
+		RETURN ( __MKSMALLINT(ret) );
 	    }
 	    _INST(position) = nil;
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 	}
     }
 %}.
@@ -906,15 +906,15 @@
 
 	if (cnt == 1) {
 	    if (_INST(position) != nil)
-		_INST(position) = _MKSMALLINT(_intVal(_INST(position)) + 1);
-	    RETURN ( _MKSMALLINT(byte) );
+		_INST(position) = __MKSMALLINT(__intVal(_INST(position)) + 1);
+	    RETURN ( __MKSMALLINT(byte) );
 	}
 	if (cnt == 0) {
 	    _INST(hitEOF) = true;
 	    RETURN (nil);
 	}
 	_INST(position) = nil;
-	_INST(lastErrorNumber) = _MKSMALLINT(errno);
+	_INST(lastErrorNumber) = __MKSMALLINT(errno);
     }
 %}.
     lastErrorNumber notNil ifTrue:[^ self readError].
@@ -992,7 +992,7 @@
 	    f = MKFD(fp);
 
 	    oClass = __Class(anObject);
-	    switch (_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
+	    switch (__intVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
 		case BYTEARRAY:
 		case WORDARRAY:
 		case LONGARRAY:
@@ -1002,13 +1002,13 @@
 		default:
 		    goto bad;
 	    }
-	    cnt = _intVal(count);
-	    offs = _intVal(start) - 1;
-	    nInstVars = _intVal(_ClassInstPtr(oClass)->c_ninstvars);
+	    cnt = __intVal(count);
+	    offs = __intVal(start) - 1;
+	    nInstVars = __intVal(__ClassInstPtr(oClass)->c_ninstvars);
 	    nInstBytes = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
 	    objSize = __Size(anObject) - nInstBytes;
 	    if ((offs >= 0) && (cnt >= 0) && (objSize >= (cnt + offs))) {
-		cp = (char *)_InstPtr(anObject) + nInstBytes + offs;
+		cp = (char *)__InstPtr(anObject) + nInstBytes + offs;
 
 		__immediateInterrupt__ = 1;
 		do {
@@ -1027,12 +1027,12 @@
 		    else {
 			pos = _INST(position);
 			if (pos != nil)
-			    _INST(position) = _MKSMALLINT(_intVal(pos) + cnt);
+			    _INST(position) = __MKSMALLINT(__intVal(pos) + cnt);
 		    }
-		    RETURN (_MKSMALLINT(cnt));
+		    RETURN (__MKSMALLINT(cnt));
 		}
 		_INST(position) = nil;
-		_INST(lastErrorNumber) = _MKSMALLINT(errno);
+		_INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    }
 	}
     }
@@ -1080,21 +1080,21 @@
 	    __immediateInterrupt__ = 0;
 	    if (second != EOF) {
 		if (_INST(position) != nil) {
-		    _INST(position) = _MKSMALLINT(_intVal(_INST(position)) + 2);
+		    _INST(position) = __MKSMALLINT(__intVal(_INST(position)) + 2);
 		}
 		if (msbFlag == true) {
 		    value = ((first & 0xFF) << 8) | (second & 0xFF);
 		} else {
 		    value = ((second & 0xFF) << 8) | (first & 0xFF);
 		}
-		RETURN (_MKSMALLINT(value));
+		RETURN (__MKSMALLINT(value));
 	    }
 	}
 	__immediateInterrupt__ = 0;
 
 	if (ferror(f) && (errno != 0)) {
 	    _INST(position) = nil;
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 	} else {
 	    _INST(hitEOF) = true;
 	    RETURN (nil);
@@ -1137,21 +1137,21 @@
 	    __immediateInterrupt__ = 0;
 	    if (second != EOF) {
 		if (_INST(position) != nil) {
-		    _INST(position) = _MKSMALLINT(_intVal(_INST(position)) + 2);
+		    _INST(position) = __MKSMALLINT(__intVal(_INST(position)) + 2);
 		}
 		if (msbFlag == true) {
 		    value = ((first & 0xFF) << 8) | (second & 0xFF);
 		} else {
 		    value = ((second & 0xFF) << 8) | (first & 0xFF);
 		}
-		RETURN (_MKSMALLINT(value));
+		RETURN (__MKSMALLINT(value));
 	    }
 	}
 	__immediateInterrupt__ = 0;
 
 	if (ferror(f) && (errno != 0)) {
 	    _INST(position) = nil;
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 	} else {
 	    _INST(hitEOF) = true;
 	    RETURN (nil);
@@ -1214,10 +1214,10 @@
 			    value = (value<<8) | (first & 0xFF);
 			}
 			if (_INST(position) != nil) {
-			    _INST(position) = _MKSMALLINT(_intVal(_INST(position)) + 4);
+			    _INST(position) = __MKSMALLINT(__intVal(_INST(position)) + 4);
 			}
 			if ((value >= _MIN_INT) && (value <= _MAX_INT)) {
-			    RETURN ( _MKSMALLINT(value));
+			    RETURN ( __MKSMALLINT(value));
 			}
 			RETURN ( _MKLARGEINT(value) );
 		    }
@@ -1225,7 +1225,7 @@
 	    }
 	}
 	if (ferror(f) && (errno != 0)) {
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    _INST(position) = nil;
 	} else {
 	    _INST(hitEOF) = true;
@@ -1289,10 +1289,10 @@
 			    value = (value<<8) | (first & 0xFF);
 			}
 			if (_INST(position) != nil) {
-			    _INST(position) = _MKSMALLINT(_intVal(_INST(position)) + 4);
+			    _INST(position) = __MKSMALLINT(__intVal(_INST(position)) + 4);
 			}
 			if (value <= _MAX_INT) {
-			    RETURN ( _MKSMALLINT(value));
+			    RETURN ( __MKSMALLINT(value));
 			}
 			RETURN ( _MKULARGEINT(value) );
 		    }
@@ -1300,7 +1300,7 @@
 	    }
 	}
 	if (ferror(f) && (errno != 0)) {
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    _INST(position) = nil;
 	} else {
 	    _INST(hitEOF) = true;
@@ -1352,7 +1352,7 @@
     if (((fp = _INST(filePointer)) != nil)
      && (_INST(mode) != @symbol(readonly))) {
 	if (__isSmallInteger(aByteValue)) {
-	    c = _intVal(aByteValue);
+	    c = __intVal(aByteValue);
 	    f = MKFD(fp);
 	    __immediateInterrupt__ = 1;
 #ifdef OLD
@@ -1373,11 +1373,11 @@
 	    if (cnt == 1) {
 		pos = _INST(position);
 		if (pos != nil)
-		    _INST(position) = _MKSMALLINT(_intVal(pos) + 1);
+		    _INST(position) = __MKSMALLINT(__intVal(pos) + 1);
 		RETURN (self);
 	    }
 	    if (cnt < 0) {
-		_INST(lastErrorNumber) = _MKSMALLINT(errno);
+		_INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    }
 	}
     }
@@ -1434,7 +1434,7 @@
      && (_INST(mode) != @symbol(readonly))) {
 	if (__bothSmallInteger(count, start)) {
 	    oClass = __Class(anObject);
-	    switch (_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
+	    switch (__intVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
 		case BYTEARRAY:
 		case WORDARRAY:
 		case LONGARRAY:
@@ -1444,15 +1444,15 @@
 		default:
 		    goto bad;
 	    }
-	    cnt = _intVal(count);
-	    offs = _intVal(start) - 1;
+	    cnt = __intVal(count);
+	    offs = __intVal(start) - 1;
 	    f = MKFD(fp);
 
-	    nInstVars = _intVal(_ClassInstPtr(oClass)->c_ninstvars);
+	    nInstVars = __intVal(__ClassInstPtr(oClass)->c_ninstvars);
 	    nInstBytes = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
 	    objSize = __Size(anObject) - nInstBytes;
 	    if ( (offs >= 0) && (cnt >= 0) && (objSize >= (cnt + offs)) ) {
-		cp = (char *)_InstPtr(anObject) + nInstBytes + offs;
+		cp = (char *)__InstPtr(anObject) + nInstBytes + offs;
 		__immediateInterrupt__ = 1;
 #ifdef OLD
 		if (_INST(buffered) == false) {
@@ -1472,10 +1472,10 @@
 		if (cnt >= 0) {
 		    pos = _INST(position);
 		    if (pos != nil)
-			_INST(position) = _MKSMALLINT(_intVal(pos) + cnt);
-		    RETURN ( _MKSMALLINT(cnt) );
+			_INST(position) = __MKSMALLINT(__intVal(pos) + cnt);
+		    RETURN ( __MKSMALLINT(cnt) );
 		}
-		_INST(lastErrorNumber) = _MKSMALLINT(errno);
+		_INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    }
 	}
     }
@@ -1505,7 +1505,7 @@
     if (((fp = _INST(filePointer)) != nil)
      && (_INST(mode) != @symbol(readonly))
      && __isSmallInteger(aNumber)) {
-	num = _intVal(aNumber);
+	num = __intVal(aNumber);
 	if (msbFlag == true) {
 	    bytes[0] = (num >> 8) & 0xFF;
 	    bytes[1] = num & 0xFF;
@@ -1533,11 +1533,11 @@
 	__immediateInterrupt__ = 0;
 	if (cnt == 2) {
 	    if (_INST(position) != nil) {
-		_INST(position) = _MKSMALLINT(_intVal(_INST(position)) + 2);
+		_INST(position) = __MKSMALLINT(__intVal(_INST(position)) + 2);
 	    }
 	    RETURN ( self );
 	}
-	_INST(lastErrorNumber) = _MKSMALLINT(errno);
+	_INST(lastErrorNumber) = __MKSMALLINT(errno);
     }
 %}.
     lastErrorNumber notNil ifTrue:[^ self writeError].
@@ -1564,7 +1564,7 @@
     if (((fp = _INST(filePointer)) != nil)
      && (_INST(mode) != @symbol(readonly))
      && __isSmallInteger(aNumber)) {
-	num = _intVal(aNumber);
+	num = __intVal(aNumber);
 	if (msbFlag == true) {
 	    bytes[0] = (num >> 24) & 0xFF;
 	    bytes[1] = (num >> 16) & 0xFF;
@@ -1596,11 +1596,11 @@
 	__immediateInterrupt__ = 0;
 	if (cnt == 4) {
 	    if (_INST(position) != nil) {
-		_INST(position) = _MKSMALLINT(_intVal(_INST(position)) + 4);
+		_INST(position) = __MKSMALLINT(__intVal(_INST(position)) + 4);
 	    }
 	    RETURN ( self );
 	}
-	_INST(lastErrorNumber) = _MKSMALLINT(errno);
+	_INST(lastErrorNumber) = __MKSMALLINT(errno);
     }
 %}.
     filePointer isNil ifTrue:[^ self errorNotOpen].
@@ -1653,12 +1653,12 @@
 	    if (c != EOF) {
 		ungetc(c, f);
 		if (_INST(binary) == true) {
-		    RETURN ( _MKSMALLINT(c & 0xFF) );
+		    RETURN ( __MKSMALLINT(c & 0xFF) );
 		}
 		RETURN ( _MKCHARACTER(c & 0xFF) );
 	    }
 	    if (ferror(f) && (errno != 0)) {
-		_INST(lastErrorNumber) = _MKSMALLINT(errno);
+		_INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    } else {
 		_INST(hitEOF) = true;
 		RETURN ( nil );
@@ -1710,18 +1710,18 @@
 	if (c != EOF) {
 	    pos = _INST(position);
 	    if (__isSmallInteger(pos)) {
-		_INST(position) = _MKSMALLINT(_intVal(pos) + 1);
+		_INST(position) = __MKSMALLINT(__intVal(pos) + 1);
 	    } else {
 		_INST(position) = nil;
 	    }
 	    if (_INST(binary) == true) {
-		RETURN ( _MKSMALLINT(c & 0xFF) );
+		RETURN ( __MKSMALLINT(c & 0xFF) );
 	    }
 	    RETURN ( _MKCHARACTER(c & 0xFF) );
 	}
 	_INST(position) = nil;
 	if (ferror(f) && (errno != 0)) {
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 	} else {
 	    _INST(hitEOF) = true;
 	    RETURN ( nil );
@@ -1740,7 +1740,7 @@
     |coll|
 
     binary ifTrue:[
-	coll := ByteArray new:count
+	coll := ByteArray uninitializedNew:count
     ] ifFalse:[
 	coll := String new:count
     ].
@@ -1790,7 +1790,7 @@
      && (_INST(mode) != @symbol(readonly))) {
 	if (_INST(binary) != true) {
 	    if (__isCharacter(aCharacter)) {
-		c = _intVal(_CharacterInstPtr(aCharacter)->c_asciivalue);
+		c = __intVal(__CharacterInstPtr(aCharacter)->c_asciivalue);
     doWrite:
 		f = MKFD(fp);
 
@@ -1810,15 +1810,15 @@
 		if (cnt == 1) {
 		    pos = _INST(position);
 		    if (pos != nil) {
-			_INST(position) = _MKSMALLINT(_intVal(pos) + 1);
+			_INST(position) = __MKSMALLINT(__intVal(pos) + 1);
 		    }
 		    RETURN ( self );
 		}
-		_INST(lastErrorNumber) = _MKSMALLINT(errno);
+		_INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    }
 	} else {
 	    if (__isSmallInteger(aCharacter)) {
-		c = _intVal(aCharacter);
+		c = __intVal(aCharacter);
 		goto doWrite;
 	    }
 	}
@@ -1853,15 +1853,15 @@
 	} else {
 	    if (_INST(binary) == true) {
 		if (__isByteArray(aCollection)) {
-		    cp = _ByteArrayInstPtr(aCollection)->ba_element;
+		    cp = __ByteArrayInstPtr(aCollection)->ba_element;
 		    len = _byteArraySize(aCollection);
 		} else {
 		    if (__isBytes(aCollection)) {
 			int nInst;
 
-			cp = _ByteArrayInstPtr(aCollection)->ba_element;
+			cp = __ByteArrayInstPtr(aCollection)->ba_element;
 			len = _byteArraySize(aCollection);
-			nInst = _intVal(_ClassInstPtr(__qClass(aCollection))->c_ninstvars);
+			nInst = __intVal(__ClassInstPtr(__qClass(aCollection))->c_ninstvars);
 			cp += __OBJS2BYTES__(nInst);
 			len -= __OBJS2BYTES__(nInst);
 		    }
@@ -1900,11 +1900,11 @@
 	    if (cnt == len) {
 		pos = _INST(position);
 		if (pos != nil) {
-		    _INST(position) = _MKSMALLINT(_intVal(pos) + len);
+		    _INST(position) = __MKSMALLINT(__intVal(pos) + len);
 		}
 		RETURN ( self );
 	    }
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 	}
     }
 %}.
@@ -1936,15 +1936,15 @@
 		}
 	    } else {
 		if (__isByteArray(aCollection)) {
-		    cp = _ByteArrayInstPtr(aCollection)->ba_element;
+		    cp = __ByteArrayInstPtr(aCollection)->ba_element;
 		    len = _byteArraySize(aCollection);
 		} else {
 		    if (__isBytes(aCollection)) {
 			int nInst;
 
-			cp = _ByteArrayInstPtr(aCollection)->ba_element;
+			cp = __ByteArrayInstPtr(aCollection)->ba_element;
 			len = _byteArraySize(aCollection);
-			nInst = _intVal(_ClassInstPtr(__qClass(aCollection))->c_ninstvars);
+			nInst = __intVal(__ClassInstPtr(__qClass(aCollection))->c_ninstvars);
 			cp += __OBJS2BYTES__(nInst);
 			len -= __OBJS2BYTES__(nInst);
 		    }
@@ -1952,8 +1952,8 @@
 	    }
 	    if (cp != NULL) {
 		f = MKFD(fp);
-		index1 = _intVal(start);
-		index2 = _intVal(stop);
+		index1 = __intVal(start);
+		index2 = __intVal(stop);
 		if ((index1 < 1) || (index2 > len) || (index2 < index1)) {
 		    RETURN ( self );
 		}
@@ -1984,11 +1984,11 @@
 		__immediateInterrupt__ = 0;
 		if (cnt == len) {
 		    if (_INST(position) != nil) {
-			_INST(position) = _MKSMALLINT(_intVal(_INST(position)) + len);
+			_INST(position) = __MKSMALLINT(__intVal(_INST(position)) + len);
 		    }
 		    RETURN ( self );
 		}
-		_INST(lastErrorNumber) = _MKSMALLINT(errno);
+		_INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    }
 	}
     }
@@ -2027,11 +2027,11 @@
 	    __immediateInterrupt__ = 0;
 	    if (cnt == 1) {
 		if (_INST(position) != nil) {
-		    _INST(position) = _MKSMALLINT(_intVal(_INST(position)) + 1);
+		    _INST(position) = __MKSMALLINT(__intVal(_INST(position)) + 1);
 		}
 		RETURN ( self );
 	    }
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 	}
     }
 %}.
@@ -2103,7 +2103,7 @@
 				clearerr(f);
 				continue;
 			    }
-			    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+			    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 			}
 			len = 0;
 		    } else {
@@ -2138,7 +2138,7 @@
 	    if (rslt != NULL) {
 		len = strlen(buffer);
 		if (_INST(position) != nil) {
-		    _INST(position) = _MKSMALLINT(_intVal(_INST(position)) + len + 1);
+		    _INST(position) = __MKSMALLINT(__intVal(_INST(position)) + len + 1);
 		}
 		/* remove EOL character */
 		if ((len != 0) && (buffer[len-1] == '\n')) {
@@ -2150,7 +2150,7 @@
 		RETURN ( _MKSTRING(buffer COMMA_CON) );
 	    }
 	    if (ferror(f) && (errno != 0)) {
-		_INST(lastErrorNumber) = _MKSMALLINT(errno);
+		_INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    } else {
 		_INST(hitEOF) = true;
 		RETURN ( nil );
@@ -2210,14 +2210,14 @@
 		    if (cnt == 1) {
 			pos = _INST(position);
 			if (pos != nil) {
-			    _INST(position) = _MKSMALLINT(_intVal(pos)+len+1);
+			    _INST(position) = __MKSMALLINT(__intVal(pos)+len+1);
 			}
 			__immediateInterrupt__ = 0;
 			RETURN ( self );
 		    }
 		}
 		__immediateInterrupt__ = 0;
-		_INST(lastErrorNumber) = _MKSMALLINT(errno);
+		_INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    }
 	}
     }
@@ -2258,7 +2258,7 @@
 		matchLen = _stringSize(aStringOrNil);
 	    }
 	    dst = MKFD(_INST(filePointer));
-	    src = (FILE *)_intVal(srcFilePointer);
+	    src = (FILE *)__intVal(srcFilePointer);
 	    __immediateInterrupt__ = 1;
 	    errno = 0;
 
@@ -2267,14 +2267,14 @@
 	    for (;;) {
 		if (fgets(buffer, sizeof(buffer), src) == NULL) {
 		    if (ferror(src)) {
-			readError = _MKSMALLINT(errno);
+			readError = __MKSMALLINT(errno);
 			goto err;
 		    }
 		    break;
 		}
 		if (fputs(buffer, dst) == EOF) {
 		    if (ferror(dst)) {
-			_INST(lastErrorNumber) = _MKSMALLINT(errno);
+			_INST(lastErrorNumber) = __MKSMALLINT(errno);
 			goto err;
 		    }
 		    break;
@@ -2347,7 +2347,7 @@
 
 	    if (cp == NULL) {
 		if (ferror(f)) {
-		    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+		    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 		    goto err;
 		} else {
 		    fseek(f, firstpos, 0);
@@ -2435,7 +2435,7 @@
 	    RETURN (false);
 	}
 	if (ferror(f) && (errno != 0)) {
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 	} else {
 	    _INST(hitEOF) = _true;
 	    RETURN (_true);
@@ -2602,13 +2602,13 @@
      && (_INST(mode) != @symbol(writeonly))) {
 	if (_INST(binary) == true) {
 	    if (__isSmallInteger(anObject)) {
-		peekValue = _intVal(anObject) & 0xFF;
+		peekValue = __intVal(anObject) & 0xFF;
 	    } else {
 		goto bad;
 	    }
 	} else {
 	    if (__isCharacter(anObject)) {
-		peekValue = _intVal(_characterVal(anObject)) & 0xFF;
+		peekValue = __intVal(_characterVal(anObject)) & 0xFF;
 	    } else {
 		goto bad;
 	    }
@@ -2627,7 +2627,7 @@
 	    OBJ pos;
 
 	    if ((pos = _INST(position)) != nil) {
-		_INST(position) = _MKSMALLINT(_intVal(pos) + 1);
+		_INST(position) = __MKSMALLINT(__intVal(pos) + 1);
 	    }
 	    RETURN (true);
 	}
@@ -2638,7 +2638,7 @@
 	}
 
 	if (ferror(f) && (errno != 0)) {
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 	} else {
 	    _INST(hitEOF) = true;
 	    RETURN (false);
@@ -2667,10 +2667,10 @@
     if (((fp = _INST(filePointer)) != nil)
      && (_INST(mode) != @symbol(writeonly))) {
 	if ((_INST(binary) == true) && __isSmallInteger(anObject)) {
-	    peekValue = _intVal(anObject) & 0xFF;
+	    peekValue = __intVal(anObject) & 0xFF;
 	} else {
 	    if ((_INST(binary) != true) && __isCharacter(anObject)) {
-		peekValue = _intVal(_characterVal(anObject)) & 0xFF;
+		peekValue = __intVal(_characterVal(anObject)) & 0xFF;
 	    } else {
 		peekValue = -1;
 	    }   
@@ -2690,7 +2690,7 @@
 		if (c == EOF) {
 		    __immediateInterrupt__ = 0;
 		    if (ferror(f) && (errno != 0)) {
-			_INST(lastErrorNumber) = _MKSMALLINT(errno);
+			_INST(lastErrorNumber) = __MKSMALLINT(errno);
 			break;
 		    }
 		    _INST(hitEOF) = true;
@@ -2736,7 +2736,7 @@
 	    __immediateInterrupt__ = 0;
 
 	    if (ferror(f) && (errno != 0)) {
-		_INST(lastErrorNumber) = _MKSMALLINT(errno);
+		_INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    } else {
 		_INST(hitEOF) = true;
 		RETURN ( nil );
@@ -2836,11 +2836,11 @@
 	if (_INST(binary) == true) {
 	    /* searched for object must be a smallInteger */
 	    if (! __isSmallInteger(aCharacter)) goto badArgument;
-	    cSearch = _intVal(aCharacter);
+	    cSearch = __intVal(aCharacter);
 	} else {
 	    /* searched for object must be a character */
 	    if (! __isCharacter(aCharacter)) goto badArgument;
-	    cSearch = _intVal(_characterVal(aCharacter));
+	    cSearch = __intVal(_characterVal(aCharacter));
 	}
 	/* Q: should we just say: "not found" ? */
 	if ((cSearch < 0) || (cSearch > 255)) goto badArgument;
@@ -2867,7 +2867,7 @@
 	    if (c < 0) {
 		__immediateInterrupt__ = 0;
 		if (ferror(f) && (errno != 0)) {
-		    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+		    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 		    break;
 		} else {
 		    _INST(hitEOF) = true;
@@ -2938,7 +2938,7 @@
 			__immediateInterrupt__ = 0;
 			if (c < 0) {
 			    if (ferror(f) && (errno != 0)) {
-				_INST(lastErrorNumber) = _MKSMALLINT(errno);
+				_INST(lastErrorNumber) = __MKSMALLINT(errno);
 				goto err;
 			    }
 			    _INST(hitEOF) = true;
@@ -2999,7 +2999,7 @@
 			__immediateInterrupt__ = 0;
 			if (c < 0) {
 			    if (ferror(f) && (errno != 0)) {
-				_INST(lastErrorNumber) = _MKSMALLINT(errno);
+				_INST(lastErrorNumber) = __MKSMALLINT(errno);
 				goto err;
 			    }
 			    _INST(hitEOF) = true;
@@ -3043,7 +3043,7 @@
 	    } while ((ch < 0) && (errno == EINTR));
 	    if (ch < 0) {
 		if (ferror(f) && (errno != 0)) {
-		    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+		    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 		    __immediateInterrupt__ = 0;
 		    goto err;
 		}
@@ -3066,7 +3066,7 @@
 	    } while ((ch < 0) && (errno == EINTR));
 	    if (ch < 0) {
 		if (ferror(f) && (errno != 0)) {
-		    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+		    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 		    __immediateInterrupt__ = 0;
 		    goto err;
 		}
@@ -3091,7 +3091,7 @@
 	__immediateInterrupt__ = 0;
 
 	if (_INST(position) != nil) {
-	    _INST(position) = _MKSMALLINT(_intVal(_INST(position)) + cnt);
+	    _INST(position) = __MKSMALLINT(__intVal(_INST(position)) + cnt);
 	}
 	buffer[len] = '\0';
 	if (len != 0) {
@@ -3177,7 +3177,7 @@
 	    case EOF:
 		__immediateInterrupt__ = 0;
 		if (ferror(f) && (errno != 0)) {
-		    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+		    _INST(lastErrorNumber) = __MKSMALLINT(errno);
 		    goto err;
 		}
 		_INST(hitEOF) = true;
@@ -3254,7 +3254,7 @@
 	if (c < 0) {
 	    __immediateInterrupt__ = 0;
 	    if (ferror(f) && (errno != 0)) {
-		_INST(lastErrorNumber) = _MKSMALLINT(errno);
+		_INST(lastErrorNumber) = __MKSMALLINT(errno);
 		goto err;
 	    }
 	    _INST(hitEOF) = true;