mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-05-13 04:17:13 +00:00
Stop Linux SAL macros from breaking C++26 CI
This commit is contained in:
parent
a560826bad
commit
380471d0bf
|
|
@ -6,6 +6,19 @@
|
|||
#include "winapi_stubs.h"
|
||||
#include "DirectXMath/DirectXMath.h"
|
||||
|
||||
// The DirectXMath SAL shim defines a few reserved identifiers such as
|
||||
// `__valid`. Newer libstdc++ headers also use those internal names, so keep
|
||||
// the shim's macros from leaking past the DirectXMath include.
|
||||
#ifdef __valid
|
||||
#undef __valid
|
||||
#endif
|
||||
#ifdef __notvalid
|
||||
#undef __notvalid
|
||||
#endif
|
||||
#ifdef __maybevalid
|
||||
#undef __maybevalid
|
||||
#endif
|
||||
|
||||
using namespace DirectX;
|
||||
|
||||
typedef struct _RECT {
|
||||
|
|
@ -64,4 +77,4 @@ enum D3D11_COMPARISON_FUNC {
|
|||
D3D11_COMPARISON_ALWAYS = 8
|
||||
};
|
||||
|
||||
#endif // D3D11STUBS_H
|
||||
#endif // D3D11STUBS_H
|
||||
|
|
|
|||
Loading…
Reference in a new issue