--- a/DirectoryStream.st	Tue Feb 09 19:01:03 2010 +0100
+++ b/DirectoryStream.st	Tue Feb 09 19:13:24 2010 +0100
@@ -136,28 +136,9 @@
 # define INT int
 
 # define __HANDLEVal(o)  (HANDLE)__externalAddressVal(o)
+#endif /* WIN32 */
 
-# ifndef DO_WRAP_CALLS
-#  define STX_C_CALL0(__nm__, __f__)                            __f__((__a1__))
-#  define STX_C_CALL1(__nm__, __f__, __a1__)                    __f__((__a1__))
-#  define STX_C_CALL2(__nm__, __f__, __a1__, __a2__)            __f__((__a1__), (__a2__))
-#  define STX_C_CALL3(__nm__, __f__, __a1__, __a2__, __a3__)    __f__((__a1__), (__a2__), (__a3__))
-#  define STX_API_CALL0(__nm__, __f__)                          __f__((__a1__))
-#  define STX_API_CALL1(__nm__, __f__, __a1__)                  __f__((__a1__))
-#  define STX_API_CALL2(__nm__, __f__, __a1__, __a2__)          __f__((__a1__), (__a2__))
-#  define STX_API_CALL3(__nm__, __f__, __a1__, __a2__, __a3__)  __f__((__a1__), (__a2__), (__a3__))
-# else
-#  define STX_C_CALL0(__nm__, __f__)                            __STX_C_CALL0(__nm__,(void*)__f__)
-#  define STX_C_CALL1(__nm__, __f__, __a1__)                    __STX_C_CALL1(__nm__,(void*)__f__, (void*)(__a1__))
-#  define STX_C_CALL2(__nm__, __f__, __a1__, __a2__)            __STX_C_CALL2(__nm__,(void*)__f__, (void*)(__a1__), (void*)(__a2__))
-#  define STX_C_CALL3(__nm__, __f__, __a1__, __a2__, __a3__)    __STX_C_CALL3(__nm__,(void*)__f__, (void*)(__a1__), (void*)(__a2__), (void*)(__a3__))
-#  define STX_API_CALL0(__nm__, __f__)                          __STX_API_CALL0(__nm__,(void*)__f__)
-#  define STX_API_CALL1(__nm__, __f__, __a1__)                  __STX_API_CALL1(__nm__,(void*)__f__, (void*)(__a1__))
-#  define STX_API_CALL2(__nm__, __f__, __a1__, __a2__)          __STX_API_CALL2(__nm__,(void*)__f__, (void*)(__a1__), (void*)(__a2__))
-#  define STX_API_CALL3(__nm__, __f__, __a1__, __a2__, __a3__)  __STX_API_CALL3(__nm__,(void*)__f__, (void*)(__a1__), (void*)(__a2__), (void*)(__a3__))
-# endif
-
-#endif /* WIN32 */
+#include "stxOSDefs.h"
 
 %}
 ! !
@@ -797,9 +778,9 @@
 !DirectoryStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/DirectoryStream.st,v 1.72 2010-02-09 18:01:03 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/DirectoryStream.st,v 1.73 2010-02-09 18:13:24 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/DirectoryStream.st,v 1.72 2010-02-09 18:01:03 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/DirectoryStream.st,v 1.73 2010-02-09 18:13:24 stefan Exp $'
 ! !