--- a/Unix.st	Thu Nov 21 15:17:13 1996 +0100
+++ b/Unix.st	Thu Nov 21 19:31:11 1996 +0100
@@ -201,15 +201,15 @@
 #  ifdef MSDOS_LIKE
 
 #   ifndef _SYS_TYPES_H_INCLUDED_
-#    include <h/sys/TYPES.h>
+#    include <types.h>
 #    define _SYS_TYPES_H_INCLUDED_
 #   endif
 #   ifndef _TIME_H_INCLUDED_
-#    include <h/time.h>
+#    include <C:\mstools\h\time.h>
 #    define _TIME_H_INCLUDED_
 #   endif
 #   ifndef _SYS_TIMEB_H_INCLUDED_
-#    include <h/sys/timeb.h>
+#    include <timeb.h>
 #    define _SYS_TIMEB_H_INCLUDED_
 #   endif
 
@@ -281,16 +281,17 @@
 #  undef Method
 #  undef Point
 #  undef Rectangle
+#  undef Block
 
 /* #  include <windows.h> /* */
-#  include <h/stdarg.h> /* */
-#  include <h/windef.h> /* */
-#  include <h/winbase.h> /* */
-#  include <h/wingdi.h> /* */
-#  include <h/winuser.h> /* */
+#  include <stdarg.h> /* */
+#  include <windef.h> /* */
+#  include <winbase.h> /* */
+#  include <wingdi.h> /* */
+#  include <winuser.h> /* */
 
 #  ifndef USE_TimerProc
-#   include <h/mmsystem.h> /* */
+#   include <mmsystem.h> /* */
 #  else
     static UINT w32TimerId;
 #  endif
@@ -307,6 +308,9 @@
 #  ifdef __DEF_Point
 #   define Point __DEF_Point
 #  endif
+#  ifdef __DEF_Block
+#   define Block __DEF_Block
+#  endif
 
 #  define stat _stat
 
@@ -6106,6 +6110,8 @@
 #endif
 
     RETURN ( __MKSTRING(OS_DEFINE));
+
+#undef OS_DEFINE
 %}
     "
      OperatingSystem getOSDefine
@@ -6126,7 +6132,7 @@
 #   endif
 
 #   ifdef WIN32
-     char *OS_STRING = "win32";
+#    define OS_STRING "win32"
 
 #   endif
 
@@ -6236,6 +6242,7 @@
 #   endif
 
     os = __MKSTRING(OS_STRING);
+
 #   undef OS_STRING
 %}.
     ^ os
@@ -8256,6 +8263,6 @@
 !OperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Attic/Unix.st,v 1.179 1996-11-18 00:10:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Attic/Unix.st,v 1.180 1996-11-21 18:31:11 cg Exp $'
 ! !
 OperatingSystem initialize!