Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 919479 - cairo fails to compile on mingw r=BenWa

Browse Source
This commit is contained in:
Jacek Caban 2013-09-24 10:39:58 +02:00
parent 1fc20ea7ab
commit 6fb25a94f8
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/cairo/cairo/src/cairo-win32-surface.c
View File

@ -59,7 +59,7 @@
#include "cairo-private.h"
#include <wchar.h>
#include <windows.h>
#include <D3D9.h>
#include <d3d9.h>
#if defined(__MINGW32__) && !defined(ETO_PDY)
# define ETO_PDY 0x2000

1
gfx/cairo/cairo/src/cairo-win32.h
View File

@ -147,6 +147,7 @@ cairo_dwrite_get_cleartype_rendering_mode();
#endif /* CAIRO_HAS_DWRITE_FONT */
struct IDirect3DSurface9;
cairo_public cairo_surface_t *
cairo_win32_surface_create_with_d3dsurface9 (struct IDirect3DSurface9 *surface);

7
gfx/cairo/win32-d3dsurface9.patch
View File

@ -74,7 +74,7 @@ diff --git a/gfx/cairo/cairo/src/cairo-win32-surface.c b/gfx/cairo/cairo/src/cai
#include "cairo-private.h"
#include <wchar.h>
#include <windows.h>
+#include <D3D9.h>
+#include <d3d9.h>
#if defined(__MINGW32__) && !defined(ETO_PDY)
# define ETO_PDY 0x2000
@ -423,7 +423,7 @@ diff --git a/gfx/cairo/cairo/src/cairo-win32-surface.c b/gfx/cairo/cairo/src/cai
diff --git a/gfx/cairo/cairo/src/cairo-win32.h b/gfx/cairo/cairo/src/cairo-win32.h
--- a/gfx/cairo/cairo/src/cairo-win32.h
+++ b/gfx/cairo/cairo/src/cairo-win32.h
@@ -59,17 +59,16 @@ cairo_win32_surface_create_with_ddb (HDC
@@ -59,17 +59,16 @@ cairo_win32_surface_create_with_ddb (HDC hdc,
cairo_format_t format,
int width,
int height);
@ -441,7 +441,7 @@ diff --git a/gfx/cairo/cairo/src/cairo-win32.h b/gfx/cairo/cairo/src/cairo-win32
cairo_public cairo_surface_t *
cairo_win32_surface_get_image (cairo_surface_t *surface);
@@ -143,16 +142,20 @@ cairo_dwrite_scaled_font_get_force_GDI_c
@@ -143,16 +142,21 @@ cairo_dwrite_scaled_font_get_force_GDI_classic(cairo_scaled_font_t *dwrite_scale
void
cairo_dwrite_set_cleartype_params(FLOAT gamma, FLOAT contrast, FLOAT level, int geometry, int mode);
@ -450,6 +450,7 @@ diff --git a/gfx/cairo/cairo/src/cairo-win32.h b/gfx/cairo/cairo/src/cairo-win32
#endif /* CAIRO_HAS_DWRITE_FONT */
+struct IDirect3DSurface9;
+cairo_public cairo_surface_t *
+cairo_win32_surface_create_with_d3dsurface9 (struct IDirect3DSurface9 *surface);
+