Skip to content

Commit 44a7046

Browse files
author
nitrocaster
committed
Prevent macro redefinitions.
1 parent d663c41 commit 44a7046

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/xrCore/Debug/dxerr.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
#include <d3d9.h>
2222
#include <audiodefs.h>
2323
#include <dsound.h>
24-
24+
#ifndef DIRECTINPUT_VERSION
2525
#define DIRECTINPUT_VERSION 0x800
26+
#endif
2627
#include <dinput.h>
2728
#include <dinputd.h>
2829
#endif
@@ -136,6 +137,11 @@ const CHAR* WINAPI DXGetErrorStringA( _In_ HRESULT hr )
136137
#undef CHK_ERR_WIN32A
137138
#undef CHK_ERR_WIN32_ONLY
138139

140+
#undef CHK_ERRA_W
141+
#undef CHK_ERR_W
142+
#undef CHK_ERRA_A
143+
#undef CHK_ERR_A
144+
139145
#define CHK_ERRA_W(hrchk) \
140146
case hrchk: \
141147
wcscpy_s( desc, count, L#hrchk );

0 commit comments

Comments
 (0)