From 764585f43aab77b23267e5b036c8cd0693639883 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Tue, 2 Feb 2010 19:02:43 +0000
Subject: [PATCH] temporarily revert dx9 sdk change

---
 dtool/Config.pp                    | 2 +-
 panda/src/dxgsg9/config_dxgsg9.cxx | 2 +-
 panda/src/dxgsg9/dxgsg9base.h      | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dtool/Config.pp b/dtool/Config.pp
index 7aefc97527..abdca7011b 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -732,7 +732,7 @@
 // Is DirectX9 available, and should we try to build with it?
 #define DX9_IPATH
 #define DX9_LPATH
-#define DX9_LIBS d3d9.lib d3dx9.lib dxerr.lib
+#define DX9_LIBS d3d9.lib d3dx9.lib dxerr9.lib
 #defer HAVE_DX9 $[libtest $[DX9_LPATH],$[DX9_LIBS]]
 
 // Is OpenCV installed, and where?
diff --git a/panda/src/dxgsg9/config_dxgsg9.cxx b/panda/src/dxgsg9/config_dxgsg9.cxx
index d614fa9608..7828cd6b1b 100755
--- a/panda/src/dxgsg9/config_dxgsg9.cxx
+++ b/panda/src/dxgsg9/config_dxgsg9.cxx
@@ -28,7 +28,7 @@
 
 #include "dconfig.h"
 
-DToolConfigure(config_dxgsg9);
+Configure(config_dxgsg9);
 NotifyCategoryDef(dxgsg9, ":display:gsg");
 NotifyCategoryDef(wdxdisplay9, "display");
 
diff --git a/panda/src/dxgsg9/dxgsg9base.h b/panda/src/dxgsg9/dxgsg9base.h
index d2bd7465ce..dbcfc31797 100755
--- a/panda/src/dxgsg9/dxgsg9base.h
+++ b/panda/src/dxgsg9/dxgsg9base.h
@@ -29,10 +29,9 @@
 
 #define D3D_OVERLOADS   //  get D3DVECTOR '+' operator, etc from d3dtypes.h
 //#define D3D_DEBUG_INFO
-#undef Configure
 #include <d3d9.h>
 #include <d3dx9.h>
-#include <dxerr.h>
+#include <dxerr9.h>
 #undef WIN32_LEAN_AND_MEAN
 
 #if (D3D_SDK_VERSION & 0xffff) < 32
@@ -41,9 +40,9 @@
 
 #ifndef D3DERRORSTRING
 #ifdef NDEBUG
-#define D3DERRORSTRING(HRESULT) " at (" << __FILE__ << ":" << __LINE__ << "), hr=" <<  DXGetErrorString(HRESULT) << endl  // leave out descriptions to shrink release build
+#define D3DERRORSTRING(HRESULT) " at (" << __FILE__ << ":" << __LINE__ << "), hr=" <<  DXGetErrorString9(HRESULT) << endl  // leave out descriptions to shrink release build
 #else
-#define D3DERRORSTRING(HRESULT) " at (" << __FILE__ << ":" << __LINE__ << "), hr=" <<  DXGetErrorString(HRESULT) << ": " << DXGetErrorDescription(HRESULT) << endl
+#define D3DERRORSTRING(HRESULT) " at (" << __FILE__ << ":" << __LINE__ << "), hr=" <<  DXGetErrorString9(HRESULT) << ": " << DXGetErrorDescription9(HRESULT) << endl
 #endif
 #endif