--- a/FileStr.st	Thu Nov 02 20:57:11 1995 +0100
+++ b/FileStr.st	Thu Nov 02 21:10:58 1995 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libbasic/Attic/FileStr.st,v 1.24 1995-09-16 17:13:21 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Attic/FileStr.st,v 1.25 1995-11-02 20:10:52 cg Exp $
 '!
 
 !FileStream class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libbasic/Attic/FileStr.st,v 1.24 1995-09-16 17:13:21 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Attic/FileStr.st,v 1.25 1995-11-02 20:10:52 cg Exp $
 "
 !
 
@@ -400,7 +400,7 @@
 	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
 	    _INST(position) = nil;
 	} else {
-	    _INST(filePointer) = MKOBJ((int)f);
+	    _INST(filePointer) = __MKOBJ((int)f);
 	    _INST(position) = _MKSMALLINT(1);
 	    retVal = self;
 	}
@@ -509,7 +509,7 @@
     int size;
 
     if (_INST(filePointer) != nil) {
-	f = (FILE *)MKFD(_INST(filePointer));
+	f = __FILEVal(_INST(filePointer));
 	if ((size = filesize(fileno(f))) >= 0) {
 	    RETURN ( _MKSMALLINT(size) );
 	}
@@ -521,7 +521,7 @@
     int fd;
 
     if (_INST(filePointer) != nil) {
-	f = (FILE *)MKFD(_INST(filePointer));
+	f = __FILEVal(_INST(filePointer));
 	fd = fileno(f);
 	do {
 	    ret = fstat(fd, &buf);
@@ -557,7 +557,7 @@
     long currentPosition;
 
     if (_INST(filePointer) != nil) {
-	f = (FILE *)MKFD(_INST(filePointer));
+	f = __FILEVal(_INST(filePointer));
 	do {
 	    if (_INST(buffered) == true) {
 		currentPosition = (long) ftell(f);
@@ -590,7 +590,7 @@
 
     if ((fp = _INST(filePointer)) != nil) {
 	if (__isSmallInteger(newPos)) {
-	    f = (FILE *)MKFD(fp);
+	    f = __FILEVal(fp);
 	    /*
 	     * notice: Smalltalk index starts at 1
 	     */
@@ -626,7 +626,7 @@
     int ret;
 
     if (_INST(filePointer) != nil) {
-	f = (FILE *)MKFD(_INST(filePointer));
+	f = __FILEVal(_INST(filePointer));
 	_INST(position) = nil;
 	do {
 	    if (_INST(buffered) == true) {