--- a/ObjectFileLoader.st	Sun Dec 17 16:22:53 1995 +0100
+++ b/ObjectFileLoader.st	Tue Dec 19 21:48:35 1995 +0100
@@ -61,10 +61,16 @@
 
 #include <stdio.h>
 
+#if defined(WIN32)
+# undef COFF
+# undef ELF
+# undef A_DOT_OUT
+#endif
+
 /*
  * if no dynamic link facilities, try it the hard way ...
  */
-#ifndef HAS_DL
+#if !defined(HAS_DL)
 
 # ifdef A_DOT_OUT
 #  include <a.out.h>
@@ -2562,7 +2568,7 @@
     /*
      * need support for other headers ... (i.e. coff, elf)
      */
-#endif
+#endif /* not HAS_DL */
 %}
 .
     ^ self error:'objectFile format not supported'
@@ -2864,6 +2870,6 @@
 !ObjectFileLoader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.67 1995-12-17 15:22:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.68 1995-12-19 20:48:35 cg Exp $'
 ! !
 ObjectFileLoader initialize!