--- a/DirectoryStream.st	Tue May 17 00:56:14 2016 +0200
+++ b/DirectoryStream.st	Tue May 17 02:04:25 2016 +0200
@@ -24,10 +24,10 @@
 %{
 #include "stxOSDefs.h"
 
-#if defined(WIN32)
+#if defined(__win32__)
 # undef UNIX_LIKE
 #else
-# if defined(transputer)
+# if defined(__transputer__)
 #  undef UNIX_LIKE
 # else
 #  define UNIX_LIKE
@@ -72,7 +72,7 @@
 
 #endif /* UNIX_LIKE */
 
-#ifdef WIN32
+#ifdef __win32__
 
 # ifdef __i386__
 #  define _X86_
@@ -560,7 +560,7 @@
 #ifdef HAS_OPENDIR
     closedir( (DIR *)(__FILEVal(dp)) );
 #else
-# ifdef WIN32
+# ifdef __win32__
     FindClose( __HANDLEVal(dp) );
 # endif
 #endif
@@ -602,7 +602,7 @@
 	}
     }
 #else
-#ifdef WIN32
+#ifdef __win32__
     HANDLE d;
     OBJ path, dp;
     union {