Henri Verbeet : d3drm: Define COBJMACROS in d3drm_private.h.
Alexandre Julliard
julliard at winehq.org
Thu Nov 10 14:37:54 CST 2016
Module: wine
Branch: master
Commit: 2bdc13efc6618e743506b90c3fb61c1c61ae5799
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdc13efc6618e743506b90c3fb61c1c61ae5799
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Nov 10 16:17:39 2016 +0100
d3drm: Define COBJMACROS in d3drm_private.h.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3drm/d3drm.c | 3 ---
dlls/d3drm/d3drm_private.h | 1 +
dlls/d3drm/device.c | 2 --
dlls/d3drm/face.c | 2 --
dlls/d3drm/frame.c | 2 --
dlls/d3drm/light.c | 2 --
dlls/d3drm/material.c | 2 --
dlls/d3drm/meshbuilder.c | 3 ---
dlls/d3drm/texture.c | 2 --
dlls/d3drm/viewport.c | 2 --
10 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index abeed11..c7c28b9 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -22,11 +22,8 @@
#include "wine/debug.h"
-#define COBJMACROS
-
#include "winbase.h"
#include "wingdi.h"
-#include "dxfile.h"
#include "rmxfguid.h"
#include "d3drm_private.h"
diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h
index 49e4af1..1aa0a98 100644
--- a/dlls/d3drm/d3drm_private.h
+++ b/dlls/d3drm/d3drm_private.h
@@ -21,6 +21,7 @@
#ifndef __D3DRM_PRIVATE_INCLUDED__
#define __D3DRM_PRIVATE_INCLUDED__
+#define COBJMACROS
#include <math.h>
#include "d3drm.h"
#include "dxfile.h"
diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c
index ef83de0..c970244 100644
--- a/dlls/d3drm/device.c
+++ b/dlls/d3drm/device.c
@@ -21,8 +21,6 @@
#include <assert.h>
#include "wine/debug.h"
-#define COBJMACROS
-
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/d3drm/face.c b/dlls/d3drm/face.c
index e9e7e9a..1fac0ba 100644
--- a/dlls/d3drm/face.c
+++ b/dlls/d3drm/face.c
@@ -20,8 +20,6 @@
#include "wine/debug.h"
-#define COBJMACROS
-
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c
index 39b2f87..861002a 100644
--- a/dlls/d3drm/frame.c
+++ b/dlls/d3drm/frame.c
@@ -22,8 +22,6 @@
#include <assert.h>
#include "wine/debug.h"
-#define COBJMACROS
-
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c
index 7a7ccd4..8d59984 100644
--- a/dlls/d3drm/light.c
+++ b/dlls/d3drm/light.c
@@ -20,8 +20,6 @@
#include "wine/debug.h"
-#define COBJMACROS
-
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c
index 8eb40b5..137ecfe 100644
--- a/dlls/d3drm/material.c
+++ b/dlls/d3drm/material.c
@@ -20,8 +20,6 @@
#include "wine/debug.h"
-#define COBJMACROS
-
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index 0028f12..20c0346 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -21,13 +21,10 @@
#define NONAMELESSUNION
-#define COBJMACROS
-
#include "wine/debug.h"
#include "winbase.h"
#include "wingdi.h"
-#include "dxfile.h"
#include "rmxfguid.h"
#include "d3drm_private.h"
diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c
index 6c622b6..5272223 100644
--- a/dlls/d3drm/texture.c
+++ b/dlls/d3drm/texture.c
@@ -20,8 +20,6 @@
#include "wine/debug.h"
-#define COBJMACROS
-
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c
index 9bb8cfc..2a1d035 100644
--- a/dlls/d3drm/viewport.c
+++ b/dlls/d3drm/viewport.c
@@ -20,8 +20,6 @@
#include "wine/debug.h"
-#define COBJMACROS
-
#include "winbase.h"
#include "wingdi.h"
More information about the wine-cvs
mailing list