mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Fix use of non-standard vararg macros. 

Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans-Kristian Arntzen 2019-10-01 12:33:44 +02:00 committed by Alexandre Julliard
parent aa007299c4
commit 50bd2db618
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/private/vkd3d_debug.h
View File

@ -67,8 +67,8 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN;
vkd3d_dbg_next_time = true; \
VKD3D_DBG_PRINTF
#define VKD3D_DBG_PRINTF(args...) \
vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, args); } while (0)
#define VKD3D_DBG_PRINTF(...) \
vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); } while (0)
#ifndef TRACE
#define TRACE VKD3D_DBG_LOG(TRACE)

20
include/private/vkd3d_test.h
View File

@ -57,40 +57,40 @@ static void vkd3d_test_end_todo(void);
unsigned int vkd3d_line = line; \
VKD3D_TEST_ASSERT_THAT
#define VKD3D_TEST_ASSERT_THAT(args...) \
vkd3d_test_assert_that(vkd3d_line, args); } while (0)
#define VKD3D_TEST_ASSERT_THAT(...) \
vkd3d_test_assert_that(vkd3d_line, __VA_ARGS__); } while (0)
#define ok_(line) \
do { \
unsigned int vkd3d_line = line; \
VKD3D_TEST_OK
#define VKD3D_TEST_OK(args...) \
vkd3d_test_ok(vkd3d_line, args); } while (0)
#define VKD3D_TEST_OK(...) \
vkd3d_test_ok(vkd3d_line, __VA_ARGS__); } while (0)
#define todo_(line) \
do { \
unsigned int vkd3d_line = line; \
VKD3D_TEST_TODO
#define VKD3D_TEST_TODO(args...) \
vkd3d_test_todo(vkd3d_line, args); } while (0)
#define VKD3D_TEST_TODO(...) \
vkd3d_test_todo(vkd3d_line, __VA_ARGS__); } while (0)
#define skip_(line) \
do { \
unsigned int vkd3d_line = line; \
VKD3D_TEST_SKIP
#define VKD3D_TEST_SKIP(args...) \
vkd3d_test_skip(vkd3d_line, args); } while (0)
#define VKD3D_TEST_SKIP(...) \
vkd3d_test_skip(vkd3d_line, __VA_ARGS__); } while (0)
#define trace_(line) \
do { \
unsigned int vkd3d_line = line; \
VKD3D_TEST_TRACE
#define VKD3D_TEST_TRACE(args...) \
vkd3d_test_trace(vkd3d_line, args); } while (0)
#define VKD3D_TEST_TRACE(...) \
vkd3d_test_trace(vkd3d_line, __VA_ARGS__); } while (0)
#define todo_if(is_todo) \
for (vkd3d_test_start_todo(is_todo); vkd3d_test_loop_todo(); vkd3d_test_end_todo())