--- a/ExtStream.st	Sat Oct 04 19:01:30 1997 +0200
+++ b/ExtStream.st	Mon Oct 06 15:28:01 1997 +0200
@@ -67,7 +67,7 @@
 
 #ifdef xxxWIN32
 # define NO_STDIO
-# define __HANDLEVal(o) 	(HFILE)(__MKCP(o))
+# define __HANDLEVal(o) 	(HFILE)(__externalAddressVal(o))
 # define READ(f, cp, n)		_lread((f), (cp), (n))
 # define WRITE(f, cp, n)	_lwrite((f), (cp), (n))
 # define FFLUSH(fp)		/* nothing */
@@ -1433,7 +1433,7 @@
 	(f = fdopen(__intVal(anInteger), __stringVal(openMode))) != 0
     ) {
 	__PROTECT__(self);
-	fp = __MKOBJ(f); 
+	fp = __MKEXTERNALADDRESS(f); 
 	__UNPROTECT__(self);
 	__INST(filePointer) = fp; __STORE(self, fp);
 	RETURN (self);
@@ -2754,7 +2754,7 @@
 	    __INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    __INST(position) = nil;
 	} else {
-	    __INST(filePointer) = fp = __MKOBJ(f); __STORE(self, fp);
+	    __INST(filePointer) = fp = __MKEXTERNALADDRESS(f); __STORE(self, fp);
 	    __INST(position) = __MKSMALLINT(1);
 	    retVal = self;
 	}
@@ -2793,7 +2793,7 @@
         if (f == NULL) {
             __INST(lastErrorNumber) = __MKSMALLINT(errno);
         } else {
-            __INST(filePointer) = fp = __MKOBJ((INT)f); __STORE(self, fp);
+            __INST(filePointer) = fp = __MKEXTERNALADDRESS((INT)f); __STORE(self, fp);
             ok = true;
         }
     }
@@ -4169,6 +4169,6 @@
 !ExternalStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Attic/ExtStream.st,v 1.145 1997-09-25 12:58:16 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Attic/ExtStream.st,v 1.146 1997-10-06 13:28:01 cg Exp $'
 ! !
 ExternalStream initialize!