[cairo-commit] cairo/src cairo-clip-private.h, 1.4, 1.5 cairoint.h, 1.233, 1.234

[Christian Biesinger]

Committed by: biesi

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv24201/src

Modified Files:
	cairo-clip-private.h cairoint.h 
Log Message:
2005-12-19  Christian Biesinger  <cbiesinger at 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.


Index: cairo-clip-private.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-clip-private.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cairo-clip-private.h	16 Dec 2005 11:02:35 -0000	1.4
+++ cairo-clip-private.h	19 Dec 2005 00:37:14 -0000	1.5
@@ -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;

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- cairoint.h	16 Dec 2005 19:21:24 -0000	1.233
+++ cairoint.h	19 Dec 2005 00:37:14 -0000	1.234
@@ -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 @@
 } 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_stroke_preserve)
 slim_hidden_proto(cairo_surface_destroy)
 
+CAIRO_END_DECLS
+
 #endif