Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com --- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/tests/d2d1.c | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index d754e85..2281eef 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -25,11 +25,12 @@ #include <assert.h> #include <limits.h> #define COBJMACROS -#include "d2d1_1.h" + #ifdef D2D1_INIT_GUID #include "initguid.h" #endif #include "dwrite_2.h" +#include "d2d1_1.h"
#ifndef ARRAY_SIZE #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 26c81e6..e89d0e9 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -19,12 +19,13 @@ #define COBJMACROS #include <limits.h> #include <math.h> -#include "d2d1_1.h" -#include "wincrypt.h" -#include "wine/test.h" #include "initguid.h" #include "dwrite.h" +#include "d2d1_1.h" #include "wincodec.h" +#include "wincrypt.h" + +#include "wine/test.h"
struct resource_readback {
On 22 June 2018 at 06:30, Alistair Leslie-Hughes leslie_alistair@hotmail.com wrote:
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com
dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/tests/d2d1.c | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-)
What are you trying to fix exactly?
https://bugs.winehq.org/show_bug.cgi?id=44052 Comment #25
Regards Alistair
________________________________ From: Henri Verbeet hverbeet@gmail.com Sent: Friday, June 22, 2018 6:23:48 PM To: Alistair Leslie-Hughes Cc: wine-devel@winehq.org Subject: Re: [PATCH] d2d1: Stop redefination on older compilers
On 22 June 2018 at 06:30, Alistair Leslie-Hughes leslie_alistair@hotmail.com wrote:
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com
dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/tests/d2d1.c | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-)
What are you trying to fix exactly?
-
Alistair Leslie-Hughes -
Henri Verbeet