--- a/Smalltalk.st	Sun Jan 09 22:25:58 1994 +0100
+++ b/Smalltalk.st	Wed Jan 12 20:11:58 1994 +0100
@@ -32,7 +32,7 @@
  - my implementation of globals is totally different
    (due to the need to be able to access globals from c-code as well).
 
-$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.10 1993-12-20 17:32:29 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.11 1994-01-12 19:10:49 claus Exp $
 '!
 
 Smalltalk at:#ErrorNumber put:nil!
@@ -65,7 +65,7 @@
 revision
     "return the revision number"
 
-    ^ 3
+    ^ 4
 
     "Smalltalk revision"
 !
@@ -369,8 +369,8 @@
      #restarted is send right after.
                    (should be used to recreate external resources (fds, bitmaps etc)
      #returnFromSnapshot is sent last
-		   (should be used to restart processes, reOpen Streams which cannot
-		    be automatically be reopened (i.e. Sockets, Pipes) and so on.
+                   (should be used to restart processes, reOpen Streams which cannot
+                    be automatically be reopened (i.e. Sockets, Pipes) and so on.
      "
 
     |deb insp|
@@ -742,7 +742,7 @@
     "evaluate the two-arg block, aBlock for all keys and values"
 
     self allKeysDo:[:aKey |
-	aBlock value:aKey value:(self at:aKey)
+        aBlock value:aKey value:(self at:aKey)
     ]
 ! !
 
@@ -1066,6 +1066,7 @@
 
     |aStream|
 
+    ObjectFileLoader isNil ifTrue:[^ false].
     aStream := self systemFileStreamFor:aFileName.
     aStream isNil ifTrue:[^ false].
     aStream close.
@@ -1112,11 +1113,13 @@
     upd := Class updateChanges:false.
     [
         ok := self fileIn:('fileIn/' , aClassName , '.ld').
-        ok ifFalse:[
-            ok := self fileInClassObject:aClassName from:('binary/' , aClassName, '.so').
-        ].
-        ok ifFalse:[
-            ok := self fileInClassObject:aClassName from:('binary/' , aClassName, '.o').
+        ObjectFileLoader notNil ifTrue:[
+            ok ifFalse:[
+                ok := self fileInClassObject:aClassName from:('binary/' , aClassName, '.so').
+            ].
+            ok ifFalse:[
+                ok := self fileInClassObject:aClassName from:('binary/' , aClassName, '.o').
+            ].
         ].
         ok ifFalse:[
             ok := self fileIn:(aClassName , '.st')
@@ -1128,11 +1131,13 @@
             fName := self fileNameForClass:aClassName.
             fName notNil ifTrue:[
                 ok := self fileIn:('fileIn/' , fName , '.ld').
-                ok ifFalse:[
-                    ok := self fileInClassObject:aClassName from:('binary/' , fName, '.so')
-                ].
-                ok ifFalse:[
-                    ok := self fileInClassObject:aClassName from:('binary/' , fName, '.o')
+                ObjectFileLoader notNil ifTrue:[
+                    ok ifFalse:[
+                        ok := self fileInClassObject:aClassName from:('binary/' , fName, '.so')
+                    ].
+                    ok ifFalse:[
+                        ok := self fileInClassObject:aClassName from:('binary/' , fName, '.o')
+                    ].
                 ].
                 ok ifFalse:[
                     ok := self fileIn:(fName , '.st')