diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-27 16:22:52 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-27 16:22:52 +0000 |
| commit | 56389060042079a1d526e98c54a7f54b1a4853f7 (patch) | |
| tree | 791a212b1eaebe8b028a390444b5a98a88e09868 /pixman/pixman/pixman.h | |
| parent | 0235891665ad311e1f81d1b0f003f433b4af4cbb (diff) | |
| parent | 65fbbe1531c1e09cd40014374fdd93cff3a1d33a (diff) | |
| download | vcxsrv-56389060042079a1d526e98c54a7f54b1a4853f7.tar.gz vcxsrv-56389060042079a1d526e98c54a7f54b1a4853f7.tar.bz2 vcxsrv-56389060042079a1d526e98c54a7f54b1a4853f7.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'pixman/pixman/pixman.h')
| -rw-r--r-- | pixman/pixman/pixman.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pixman/pixman/pixman.h b/pixman/pixman/pixman.h index 03a233e00..69af0f90f 100644 --- a/pixman/pixman/pixman.h +++ b/pixman/pixman/pixman.h @@ -72,9 +72,15 @@ SOFTWARE. #include <pixman-version.h> #ifdef __cplusplus -extern "C" { +#define PIXMAN_BEGIN_DECLS extern "C" { +#define PIXMAN_END_DECLS } +#else +#define PIXMAN_BEGIN_DECLS +#define PIXMAN_END_DECLS #endif +PIXMAN_BEGIN_DECLS + /* * Standard integers */ @@ -170,6 +176,7 @@ struct pixman_transform /* forward declaration (sorry) */ struct pixman_box16; +typedef union pixman_image pixman_image_t; void pixman_transform_init_identity (struct pixman_transform *matrix); pixman_bool_t pixman_transform_point_3d (const struct pixman_transform *transform, @@ -401,6 +408,8 @@ pixman_bool_t pixman_region_init_rects (pixman_region16_t *reg int count); void pixman_region_init_with_extents (pixman_region16_t *region, pixman_box16_t *extents); +void pixman_region_init_from_image (pixman_region16_t *region, + pixman_image_t *image); void pixman_region_fini (pixman_region16_t *region); @@ -488,6 +497,8 @@ pixman_bool_t pixman_region32_init_rects (pixman_region32_t *r int count); void pixman_region32_init_with_extents (pixman_region32_t *region, pixman_box32_t *extents); +void pixman_region32_init_from_image (pixman_region32_t *region, + pixman_image_t *image); void pixman_region32_fini (pixman_region32_t *region); @@ -561,7 +572,6 @@ const char* pixman_version_string (void); /* * Images */ -typedef union pixman_image pixman_image_t; typedef struct pixman_indexed pixman_indexed_t; typedef struct pixman_gradient_stop pixman_gradient_stop_t; @@ -914,8 +924,6 @@ void pixman_rasterize_trapezoid (pixman_image_t *image, int x_off, int y_off); -#ifdef __cplusplus -} -#endif +PIXMAN_END_DECLS #endif /* PIXMAN_H__ */ |