--- a/ExternalStream.st	Thu Apr 20 20:04:43 1995 +0200
+++ b/ExternalStream.st	Mon May 01 23:30:32 1995 +0200
@@ -24,7 +24,7 @@
 COPYRIGHT (c) 1988 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.34 1995-04-11 14:49:18 claus Exp $
+$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.35 1995-05-01 21:29:31 claus Exp $
 '!
 
 !ExternalStream primitiveDefinitions!
@@ -87,7 +87,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.34 1995-04-11 14:49:18 claus Exp $
+$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.35 1995-05-01 21:29:31 claus Exp $
 "
 !
 
@@ -970,7 +970,7 @@
 	if (__bothSmallInteger(count, start)) {
 	    f = MKFD(fp);
 
-	    oClass = _Class(anObject);
+	    oClass = __Class(anObject);
 	    switch (_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
 		case BYTEARRAY:
 		case WORDARRAY:
@@ -985,7 +985,7 @@
 	    offs = _intVal(start) - 1;
 	    nInstVars = _intVal(_ClassInstPtr(oClass)->c_ninstvars);
 	    nInstBytes = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
-	    objSize = _Size(anObject) - nInstBytes;
+	    objSize = __Size(anObject) - nInstBytes;
 	    if ((offs >= 0) && (cnt >= 0) && (objSize >= (cnt + offs))) {
 		cp = (char *)_InstPtr(anObject) + nInstBytes + offs;
 
@@ -1412,7 +1412,7 @@
     if (((fp = _INST(filePointer)) != nil)
      && (_INST(mode) != @symbol(readonly))) {
 	if (__bothSmallInteger(count, start)) {
-	    oClass = _Class(anObject);
+	    oClass = __Class(anObject);
 	    switch (_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
 		case BYTEARRAY:
 		case WORDARRAY:
@@ -1429,7 +1429,7 @@
 
 	    nInstVars = _intVal(_ClassInstPtr(oClass)->c_ninstvars);
 	    nInstBytes = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
-	    objSize = _Size(anObject) - nInstBytes;
+	    objSize = __Size(anObject) - nInstBytes;
 	    if ( (offs >= 0) && (cnt >= 0) && (objSize >= (cnt + offs)) ) {
 		cp = (char *)_InstPtr(anObject) + nInstBytes + offs;
 		__immediateInterrupt__ = 1;
@@ -1834,7 +1834,7 @@
 
 			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);
 		    }
@@ -1917,7 +1917,7 @@
 
 			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);
 		    }