TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

windisplay: Undefine Configure before including d3d9.h

Browse Source 
This is for consistency with fbbc5bb9e63 which introduced the
same `#undef Configure` in dxgsg9. This prevents dtool's own
Configure() macro from conflicting with the declaration of
D3D9's Configure function in d3d9.h.
This commit is contained in:
Sam Edwards 2018-11-01 16:03:58 -06:00
parent c4f5ed308f
commit a246acc640
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
panda/src/windisplay/winDetectDx9.cxx
View File

@ -18,6 +18,7 @@
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1 #define WIN32_LEAN_AND_MEAN 1
#endif #endif
#undef Configure
#include <d3d9.h> #include <d3d9.h>
#include "graphicsStateGuardian.h" #include "graphicsStateGuardian.h"
#include "graphicsPipe.h" #include "graphicsPipe.h"