diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-03-21 17:59:26 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-03-21 17:59:26 +0000 |
| commit | 2152c53fe2292956b122e1fab16775e4727ee516 (patch) | |
| tree | e7aa79360d7b27b13a83c78eb99d96c520038676 /src/extension/internal/cairo-render-context.cpp | |
| parent | fix macro redefinition errors (diff) | |
| download | inkscape-2152c53fe2292956b122e1fab16775e4727ee516.tar.gz inkscape-2152c53fe2292956b122e1fab16775e4727ee516.zip | |
cairo-render-context: swap order of header inclusion to redefinition clash of #define STRICT in pangowin32.h with windef.h (pango should check if STRICT is already defined or not)
(bzr r13180)
Diffstat (limited to 'src/extension/internal/cairo-render-context.cpp')
| -rw-r--r-- | src/extension/internal/cairo-render-context.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index 4ec6ae1c8..c09b8e9c8 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -72,8 +72,8 @@ #include <cairo-ft.h> #endif #ifdef CAIRO_HAS_WIN32_FONT -#include <cairo-win32.h> #include <pango/pangowin32.h> +#include <cairo-win32.h> #endif #include <pango/pangofc-fontmap.h> |