Jacek Caban : winnt.h: Use the same C_ASSERT version on all compilers.

Alexandre Julliard julliard at winehq.org
Thu Apr 23 14:54:32 CDT 2020


Module: wine
Branch: master
Commit: b1aba79b8b31fe5b070d168014096aa6e8a00178
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b1aba79b8b31fe5b070d168014096aa6e8a00178

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Apr 23 15:48:53 2020 +0200

winnt.h: Use the same C_ASSERT version on all compilers.

It works on MSCV as well.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 include/winnt.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/include/winnt.h b/include/winnt.h
index 057f178845..c90e9052de 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -388,11 +388,7 @@ extern "C" {
 
 /* Compile time assertion */
 
-#if defined(_MSC_VER)
-# define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1]
-#else
-# define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1])
-#endif
+#define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1])
 
 /* Eliminate Microsoft C/C++ compiler warning 4715 */
 #if defined(_MSC_VER) && (_MSC_VER > 1200)




More information about the wine-cvs mailing list