Andre Heider : Revert "include: Use the ARRAY_SIZE() macro in debug.h.".

Alexandre Julliard julliard at winehq.org
Mon Nov 19 15:59:37 CST 2018


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

Author: Andre Heider <a.heider at gmail.com>
Date:   Sun Nov 18 18:26:21 2018 +0100

Revert "include: Use the ARRAY_SIZE() macro in debug.h.".

This reverts commit af3992374e530a037e650b45194f933c5406038f.

wine/debug.h is a public header, and ARRAY_SIZE() is not defined for
external projects.

Signed-off-by: Andre Heider <a.heider at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 include/wine/debug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wine/debug.h b/include/wine/debug.h
index 066873a..fb0d6bb 100644
--- a/include/wine/debug.h
+++ b/include/wine/debug.h
@@ -254,7 +254,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt )
     if (vt & ~VT_TYPEMASK)
         return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] );
 
-    if (vt < ARRAY_SIZE(variant_types))
+    if (vt < sizeof(variant_types)/sizeof(*variant_types))
         return variant_types[vt];
 
     if (vt == VT_BSTR_BLOB)




More information about the wine-cvs mailing list