Hans-Kristian Arntzen : vkd3d: Fix use of non-standard vararg macros.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 50bd2db618cdc3de79e3e5fa3fd686441514108d
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=50bd2db618cdc3de79e3e5fa...

Author: Hans-Kristian Arntzen 
Date:   Tue Oct  1 12:33:44 2019 +0200

vkd3d: Fix use of non-standard vararg macros.

Signed-off-by: Hans-Kristian Arntzen 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

include/private/vkd3d_debug.h |  4 ++--
 include/private/vkd3d_test.h  | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h
index 1a44cb9..c37c841 100644
--- a/include/private/vkd3d_debug.h
+++ b/include/private/vkd3d_debug.h
@@ -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)
diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h
index 319bf5d..6b8763d 100644
--- a/include/private/vkd3d_test.h
+++ b/include/private/vkd3d_test.h
@@ -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())