Vijay Kiran Kamuju : d3drm: Include d3drmobj.h in d3drm.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 02ca43cbbcbda8c21bda061a29043c753c1ce3af
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=02ca43cbbcbda8c21bda061a29...

Author: Vijay Kiran Kamuju 
Date:   Wed Aug 27 12:27:38 2008 -0400

d3drm: Include d3drmobj.h in d3drm.h.

---

include/d3drm.h    |    2 +-
 include/d3drmobj.h |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/include/d3drm.h b/include/d3drm.h
index 3168900..4ee4354 100644
--- a/include/d3drm.h
+++ b/include/d3drm.h
@@ -20,7 +20,7 @@
 #define __D3DRM_H__

#include <ddraw.h>
-/* #include <d3drmobj.h> */
+#include <d3drmobj.h>

/* Direct3DRM Object CLSID */
diff --git a/include/d3drmobj.h b/include/d3drmobj.h
index ca32ec9..ab37ebc 100644
--- a/include/d3drmobj.h
+++ b/include/d3drmobj.h
@@ -65,6 +65,9 @@ typedef struct _D3DRMPICKDESC2
 /*****************************************************************************
  * IDirect3DRMObject interface
  */
+#ifdef WINE_NO_UNICODE_MACROS
+#undef GetClassName
+#endif
 #define INTERFACE IDirect3DRMObject
 DECLARE_INTERFACE_(IDirect3DRMObject,IUnknown)
 {