From a246acc64046fd6d4f0582b749f192710bd48c39 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Thu, 1 Nov 2018 16:03:58 -0600 Subject: [PATCH] windisplay: Undefine Configure before including d3d9.h 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. --- panda/src/windisplay/winDetectDx9.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/panda/src/windisplay/winDetectDx9.cxx b/panda/src/windisplay/winDetectDx9.cxx index 2e293950f6..4be10f0492 100644 --- a/panda/src/windisplay/winDetectDx9.cxx +++ b/panda/src/windisplay/winDetectDx9.cxx @@ -18,6 +18,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif +#undef Configure #include #include "graphicsStateGuardian.h" #include "graphicsPipe.h"