diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2008-09-19 17:17:03 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2008-09-19 17:19:10 -0400 |
| commit | d84752605a4aee96fa872a97a50e59a44ee7051a (patch) | |
| tree | ee5f1eac2401cf1e381a6921a2f932bd0db6112e /src/cairo-region-private.h | |
| parent | eb89bf049a4c2ab0946c45a1277bfd8b1519efa1 (diff) | |
| download | cairo-d84752605a4aee96fa872a97a50e59a44ee7051a.tar.gz | |
Make sure (and check) that all private headers include some cairo header first
The macros CAIRO_BEGIN_DECLS and CAIRO_END_DECLS are declared in two
places: config.h and cairo.h. On Win32 build there is no config.h. So,
we can't rely on pulling CAIRO_BEGIN_DECLS from there. Hence, we now:
* Not add those declarations to config.h anymore,
* Test that every cairo private header includes some other cairo
header before any other includes.
These two are fairly enough to ensure that cairo.h is seen from all
private headers. There's still the case of headers not including
any header file at all. I'll fix that later.
Diffstat (limited to 'src/cairo-region-private.h')
| -rw-r--r-- | src/cairo-region-private.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/cairo-region-private.h b/src/cairo-region-private.h index 1902500de..352a23f99 100644 --- a/src/cairo-region-private.h +++ b/src/cairo-region-private.h @@ -37,11 +37,13 @@ #ifndef CAIRO_REGION_PRIVATE_H #define CAIRO_REGION_PRIVATE_H -#include <pixman.h> - #include "cairo-compiler-private.h" #include "cairo-types-private.h" +#include <pixman.h> + +CAIRO_BEGIN_DECLS + /* #cairo_region_t is defined in cairoint.h */ struct _cairo_region { @@ -109,4 +111,6 @@ cairo_private pixman_region_overlap_t _cairo_region_contains_rectangle (cairo_region_t *region, cairo_rectangle_int_t *box); +CAIRO_END_DECLS + #endif /* CAIRO_REGION_PRIVATE_H */ |