Zebediah Figura : user32: Remove no longer needed assert() workarounds for MinGW.
Alexandre Julliard
julliard at winehq.org
Tue Feb 1 15:21:33 CST 2022
Module: wine
Branch: master
Commit: 60c20ee2c5c3805d8625e651bf878b5567d94110
URL: https://source.winehq.org/git/wine.git/?a=commit;h=60c20ee2c5c3805d8625e651bf878b5567d94110
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Mon Jan 31 17:00:58 2022 -0600
user32: Remove no longer needed assert() workarounds for MinGW.
We build with msvcrt, so we don't link against MinGW's assert() anymore.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/user_private.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h
index 3b542ea1452..d1016780658 100644
--- a/dlls/user32/user_private.h
+++ b/dlls/user32/user_private.h
@@ -296,12 +296,6 @@ typedef struct
extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN;
extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN;
-/* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */
-#ifdef __MINGW32__
-#undef assert
-#define assert(expr) ((void)0)
-#endif
-
extern struct user_api_hook *user_api DECLSPEC_HIDDEN;
LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN;
LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN;
More information about the wine-cvs
mailing list