--- a/ObjectMemory.st	Tue May 21 21:58:09 2013 +0100
+++ b/ObjectMemory.st	Fri May 24 18:52:05 2013 +0100
@@ -3939,18 +3939,13 @@
     "return the setting of the optimize contexts flag"
 
 %{  /* NOCONTEXT */
-#ifndef WIN32
     extern int __optimizeContexts();
 
     RETURN (__optimizeContexts(-1) ? true : false);
-#else
-	RETURN ( true );
-#endif
 %}
     "
      ObjectMemory optimizeContexts
     "
-
 !
 
 optimizeContexts:aBoolean
@@ -3959,25 +3954,20 @@
      Execution is a bit slower if enabled."
 
 %{  /* NOCONTEXT */
-#ifndef WIN32
     extern int __optimizeContexts();
     int prev;
 
     prev = __optimizeContexts(aBoolean == true
-				   ? 1
-				   : (aBoolean == false)
-					? 0
-					: -1);
+                                   ? 1
+                                   : (aBoolean == false)
+                                        ? 0
+                                        : -1);
     RETURN (prev ? true : false);
-#else
-	RETURN ( true );
-#endif
 %}
     "
      ObjectMemory optimizeContexts:true
      ObjectMemory optimizeContexts:false
     "
-
 !
 
 reEnableJustInTimeCompilation
@@ -5514,11 +5504,11 @@
 !ObjectMemory class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ObjectMemory.st,v 1.267 2013-03-31 12:50:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ObjectMemory.st,v 1.268 2013-05-11 17:42:41 stefan Exp $'
 !
 
 version_SVN
-    ^ '§ Id: ObjectMemory.st 10643 2011-06-08 21:53:07Z vranyj1  §'
+    ^ '$ Id: ObjectMemory.st 10643 2011-06-08 21:53:07Z vranyj1  $'
 ! !