Module: vkd3d Branch: master Commit: c8e05a93b4e6680bcf82b0fbe7e81c8b5020b44b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c8e05a93b4e6680bcf82b0fb...
Author: Józef Kucia jkucia@codeweavers.com Date: Thu Jan 31 11:29:34 2019 +0100
include: Avoid redefining ARRAY_SIZE().
winnt.h from Wine defines ARRAY_SIZE() when __WINESRC__ is defined.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/private/vkd3d_common.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index d942acf..1129f1e 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -22,7 +22,9 @@ #include "config.h" #include "vkd3d_windows.h"
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) +#ifndef ARRAY_SIZE +# define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) +#endif
#define DIV_ROUND_UP(a, b) ((a) % (b) == 0 ? (a) / (b) : (a) / (b) + 1)