--- a/DirectoryStream.st Fri Dec 07 19:13:52 2001 +0100
+++ b/DirectoryStream.st Mon Dec 10 17:27:28 2001 +0100
@@ -113,23 +113,23 @@
# define __HANDLEVal(o) (HANDLE)__externalAddressVal(o)
# ifndef DO_WRAP_CALLS
-# define STX_C_CALL0(__f__) __f__((__a1__))
-# define STX_C_CALL1(__f__, __a1__) __f__((__a1__))
-# define STX_C_CALL2(__f__, __a1__, __a2__) __f__((__a1__), (__a2__))
-# define STX_C_CALL3(__f__, __a1__, __a2__, __a3__) __f__((__a1__), (__a2__), (__a3__))
-# define STX_API_CALL0(__f__) __f__((__a1__))
-# define STX_API_CALL1(__f__, __a1__) __f__((__a1__))
-# define STX_API_CALL2(__f__, __a1__, __a2__) __f__((__a1__), (__a2__))
-# define STX_API_CALL3(__f__, __a1__, __a2__, __a3__) __f__((__a1__), (__a2__), (__a3__))
+# 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(__f__) __STX_C_CALL0((void*)__f__)
-# define STX_C_CALL1(__f__, __a1__) __STX_C_CALL1((void*)__f__, (void*)(__a1__))
-# define STX_C_CALL2(__f__, __a1__, __a2__) __STX_C_CALL2((void*)__f__, (void*)(__a1__), (void*)(__a2__))
-# define STX_C_CALL3(__f__, __a1__, __a2__, __a3__) __STX_C_CALL3((void*)__f__, (void*)(__a1__), (void*)(__a2__), (void*)(__a3__))
-# define STX_API_CALL0(__f__) __STX_API_CALL0((void*)__f__)
-# define STX_API_CALL1(__f__, __a1__) __STX_API_CALL1((void*)__f__, (void*)(__a1__))
-# define STX_API_CALL2(__f__, __a1__, __a2__) __STX_API_CALL2((void*)__f__, (void*)(__a1__), (void*)(__a2__))
-# define STX_API_CALL3(__f__, __a1__, __a2__, __a3__) __STX_API_CALL3((void*)__f__, (void*)(__a1__), (void*)(__a2__), (void*)(__a3__))
+# 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 */
@@ -529,7 +529,7 @@
do {
__threadErrno = 0;
- rslt = STX_API_CALL2( FindNextFile, d, &data );
+ rslt = STX_API_CALL2( "FindNextFile", FindNextFile, d, &data );
} while ((rslt < 0) && (__threadErrno == EINTR));
if (rslt > 0) {
@@ -636,7 +636,7 @@
do {
__threadErrno = 0;
- d = STX_API_CALL2( FindFirstFile, pattern, &data );
+ d = STX_API_CALL2( "FindFirstFile", FindFirstFile, pattern, &data );
} while ((d < 0) && (__threadErrno == EINTR));
if (d == INVALID_HANDLE_VALUE) {
@@ -714,5 +714,5 @@
!DirectoryStream class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/DirectoryStream.st,v 1.51 2001-12-05 14:57:07 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/DirectoryStream.st,v 1.52 2001-12-10 16:27:28 cg Exp $'
! !