Francois Gouget : dwrite: Avoid redefining the DWRITE_GLYPH_RUN typedef.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8127fd959917d609aaaa737da0d5bd27a41af1f9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8127fd959917d609aaaa737da0...

Author: Francois Gouget 
Date:   Fri Oct 10 08:37:07 2014 +0200

dwrite: Avoid redefining the DWRITE_GLYPH_RUN typedef.

---

include/d2d1.idl   | 3 +++
 include/dwrite.idl | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/d2d1.idl b/include/d2d1.idl
index 4934acc..1623e46 100644
--- a/include/d2d1.idl
+++ b/include/d2d1.idl
@@ -37,7 +37,10 @@ interface IDWriteTextLayout;
 interface IWICBitmapSource;
 interface IWICBitmap;

+cpp_quote("#ifndef __dwrite_h__")
+/* already defined in dwrite.h but needed for WIDL */
 typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN;
+cpp_quote("#endif /* __dwrite_h__ */")

typedef D2D_POINT_2F D2D1_POINT_2F;
 typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F;
diff --git a/include/dwrite.idl b/include/dwrite.idl
index 1888215..2ae5164 100644
--- a/include/dwrite.idl
+++ b/include/dwrite.idl
@@ -382,7 +382,11 @@ typedef struct DWRITE_TRIMMING
     UINT32 delimiterCount;
 } DWRITE_TRIMMING;

-typedef struct DWRITE_GLYPH_RUN
+cpp_quote("#ifndef __d2d1_h__")
+typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN;
+cpp_quote("#endif /* __d2d1_h__ */")
+
+struct DWRITE_GLYPH_RUN
 {
     IDWriteFontFace* fontFace;
     FLOAT fontEmSize;
@@ -392,7 +396,7 @@ typedef struct DWRITE_GLYPH_RUN
     DWRITE_GLYPH_OFFSET const* glyphOffsets;
     BOOL isSideways;
     UINT32 bidiLevel;
-} DWRITE_GLYPH_RUN;
+};

typedef struct DWRITE_GLYPH_RUN_DESCRIPTION
 {