include: Avoid using variable names starting with "__".

Names that begin with "__" are reserved.
This commit is contained in:
Józef Kucia 2016-10-10 11:22:50 +02:00
parent a22b594c0a
commit eb05a388e1
2 changed files with 11 additions and 11 deletions

View File

@ -48,11 +48,11 @@ const char *debugstr_w(const WCHAR *wstr) DECLSPEC_HIDDEN;
#define VKD3D_DBG_LOG(level) \
do { \
const enum vkd3d_dbg_level __level = VKD3D_DBG_LEVEL_##level; \
const enum vkd3d_dbg_level vkd3d_dbg_level = VKD3D_DBG_LEVEL_##level; \
VKD3D_DBG_PRINTF
#define VKD3D_DBG_PRINTF(args...) \
vkd3d_dbg_printf(__level, __FUNCTION__, args); } while (0)
vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, args); } while (0)
#define TRACE VKD3D_DBG_LOG(TRACE)
#define WARN VKD3D_DBG_LOG(WARN)

View File

@ -50,40 +50,40 @@ static const char *vkd3d_test_name;
#define ok_(line) \
do { \
unsigned int __line = line; \
unsigned int vkd3d_line = line; \
VKD3D_TEST_OK
#define VKD3D_TEST_OK(args...) \
vkd3d_test_ok(__line, args); } while (0)
vkd3d_test_ok(vkd3d_line, args); } while (0)
#define todo_(line) \
do { \
unsigned int __line = line; \
unsigned int vkd3d_line = line; \
VKD3D_TEST_TODO
#ifdef _WIN32
# define VKD3D_TEST_TODO(args...) \
vkd3d_test_ok(__line, args); } while (0)
vkd3d_test_ok(vkd3d_line, args); } while (0)
#else
# define VKD3D_TEST_TODO(args...) \
vkd3d_test_todo(__line, args); } while (0)
vkd3d_test_todo(vkd3d_line, args); } while (0)
#endif /* _WIN32 */
#define skip_(line) \
do { \
unsigned int __line = line; \
unsigned int vkd3d_line = line; \
VKD3D_TEST_SKIP
#define VKD3D_TEST_SKIP(args...) \
vkd3d_test_skip(__line, args); } while (0)
vkd3d_test_skip(vkd3d_line, args); } while (0)
#define trace_(line) \
do { \
unsigned int __line = line; \
unsigned int vkd3d_line = line; \
VKD3D_TEST_TRACE
#define VKD3D_TEST_TRACE(args...) \
vkd3d_test_trace(__line, args); } while (0)
vkd3d_test_trace(vkd3d_line, args); } while (0)
static struct
{