--- a/ExtStream.st	Thu Nov 02 12:28:52 1995 +0100
+++ b/ExtStream.st	Thu Nov 02 16:15:43 1995 +0100
@@ -24,7 +24,7 @@
 COPYRIGHT (c) 1988 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libbasic/Attic/ExtStream.st,v 1.59 1995-10-31 17:19:11 cg Exp $
+$Header: /cvs/stx/stx/libbasic/Attic/ExtStream.st,v 1.60 1995-11-02 15:15:43 cg Exp $
 '!
 
 !ExternalStream primitiveDefinitions!
@@ -151,7 +151,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libbasic/Attic/ExtStream.st,v 1.59 1995-10-31 17:19:11 cg Exp $
+$Header: /cvs/stx/stx/libbasic/Attic/ExtStream.st,v 1.60 1995-11-02 15:15:43 cg Exp $
 "
 !
 
@@ -664,7 +664,7 @@
 
     if ((fp = _INST(filePointer)) != nil) {
 	f = MKFD(fp);
-	RETURN ( MKOBJ(fileno(f)) );
+	RETURN ( __MKSMALLINT(fileno(f)) );
     }
 %}
 .
@@ -2428,7 +2428,7 @@
 		matchLen = _stringSize(aStringOrNil);
 	    }
 	    dst = MKFD(_INST(filePointer));
-	    src = (FILE *)__intVal(srcFilePointer);
+	    src = MKFD(srcFilePointer);
 	    __BEGIN_INTERRUPTABLE__
 	    errno = 0;
 

--- a/ExternalStream.st	Thu Nov 02 12:28:52 1995 +0100
+++ b/ExternalStream.st	Thu Nov 02 16:15:43 1995 +0100
@@ -24,7 +24,7 @@
 COPYRIGHT (c) 1988 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.59 1995-10-31 17:19:11 cg Exp $
+$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.60 1995-11-02 15:15:43 cg Exp $
 '!
 
 !ExternalStream primitiveDefinitions!
@@ -151,7 +151,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.59 1995-10-31 17:19:11 cg Exp $
+$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.60 1995-11-02 15:15:43 cg Exp $
 "
 !
 
@@ -664,7 +664,7 @@
 
     if ((fp = _INST(filePointer)) != nil) {
 	f = MKFD(fp);
-	RETURN ( MKOBJ(fileno(f)) );
+	RETURN ( __MKSMALLINT(fileno(f)) );
     }
 %}
 .
@@ -2428,7 +2428,7 @@
 		matchLen = _stringSize(aStringOrNil);
 	    }
 	    dst = MKFD(_INST(filePointer));
-	    src = (FILE *)__intVal(srcFilePointer);
+	    src = MKFD(srcFilePointer);
 	    __BEGIN_INTERRUPTABLE__
 	    errno = 0;