Move enum to cairoint.h

add CAIRO_BEGIN_DECLS and CAIRO_END_DECLS, and move an enum from cairo-clip-private.h here (C++ doesn't like forward-declarations of enums). Final patch for allowing C++ backends.
reviewed by: cworth
This commit is contained in:
Christian Biesinger 2005-12-18 16:37:14 +00:00
parent 2c8859c8b5
commit 93da7fa203
3 changed files with 19 additions and 7 deletions

View file

@ -1,3 +1,13 @@
2005-12-19 Christian Biesinger <cbiesinger@web.de>
reviewed by: cworth
* src/cairo-clip-private.h: Move enum to cairoint.h
* src/cairoint.h: add CAIRO_BEGIN_DECLS and CAIRO_END_DECLS, and
move an enum from cairo-clip-private.h here (C++ doesn't like
forward-declarations of enums). Final patch for allowing C++
backends.
2005-12-17 Christian Biesinger <cbiesinger@web.de>
* configure.in: make the SVG backend freetype message actually mention SVG

View file

@ -38,12 +38,6 @@
#include "cairo-path-fixed-private.h"
enum _cairo_clip_mode {
CAIRO_CLIP_MODE_PATH,
CAIRO_CLIP_MODE_REGION,
CAIRO_CLIP_MODE_MASK
};
struct _cairo_clip_path {
unsigned int ref_count;
cairo_path_fixed_t path;

View file

@ -66,6 +66,8 @@
#include "cairo-debug.h"
#include <pixman.h>
CAIRO_BEGIN_DECLS
#if __GNUC__ >= 3 && defined(__ELF__)
# define slim_hidden_proto(name) slim_hidden_proto1(name, INT_##name)
# define slim_hidden_def(name) slim_hidden_def1(name, INT_##name)
@ -249,7 +251,11 @@ typedef enum cairo_direction {
} cairo_direction_t;
typedef struct _cairo_path_fixed cairo_path_fixed_t;
typedef enum _cairo_clip_mode cairo_clip_mode_t;
typedef enum _cairo_clip_mode {
CAIRO_CLIP_MODE_PATH,
CAIRO_CLIP_MODE_REGION,
CAIRO_CLIP_MODE_MASK
} cairo_clip_mode_t;
typedef struct _cairo_clip_path cairo_clip_path_t;
typedef struct _cairo_clip cairo_clip_t;
@ -2167,4 +2173,6 @@ slim_hidden_proto(cairo_save)
slim_hidden_proto(cairo_stroke_preserve)
slim_hidden_proto(cairo_surface_destroy)
CAIRO_END_DECLS
#endif