[cairo-commit] rcairo/src rb_cairo.h, 1.15, 1.16 rb_cairo_surface.c, 1.29, 1.30
Kouhei Sutou
commit at pdx.freedesktop.org
Tue Apr 29 21:57:53 PDT 2008
Committed by: kou
Update of /cvs/cairo/rcairo/src
In directory kemper:/tmp/cvs-serv30435/src
Modified Files:
rb_cairo.h rb_cairo_surface.c
Log Message:
* src/rb_cairo.h: move environment dependent headers to ...
* src/rb_cairo_surface.c: ... here.
guard T_DATA macro for old Mac OS X environment.
* extconf.rb: check enum ruby_value_type availability that is
defined in Ruby 1.9 with RUBY_T_DATA.
Index: rb_cairo.h
===================================================================
RCS file: /cvs/cairo/rcairo/src/rb_cairo.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- rb_cairo.h 11 Apr 2008 03:01:33 -0000 1.15
+++ rb_cairo.h 30 Apr 2008 04:57:51 -0000 1.16
@@ -30,16 +30,6 @@
# include <cairo-svg.h>
#endif
-#if CAIRO_HAS_WIN32_SURFACE
-# define OpenFile OpenFile_win32
-# include <cairo-win32.h>
-# undef OpenFile
-#endif
-
-#if CAIRO_HAS_QUARTZ_SURFACE
-# include <cairo-quartz.h>
-#endif
-
#define CAIRO_CHECK_VERSION(major, minor, micro) \
(CAIRO_VERSION_MAJOR > (major) || \
(CAIRO_VERSION_MAJOR == (major) && CAIRO_VERSION_MINOR > (minor)) || \
Index: rb_cairo_surface.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/rb_cairo_surface.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- rb_cairo_surface.c 16 Apr 2008 14:48:23 -0000 1.29
+++ rb_cairo_surface.c 30 Apr 2008 04:57:51 -0000 1.30
@@ -17,6 +17,23 @@
#include "rubyio.h"
+#if CAIRO_HAS_WIN32_SURFACE
+# define OpenFile OpenFile_win32
+# include <cairo-win32.h>
+# undef OpenFile
+#endif
+
+#if CAIRO_HAS_QUARTZ_SURFACE
+# ifndef HAVE_TYPE_ENUM_RUBY_VALUE_TYPE
+enum ruby_value_type {
+ RUBY_T_DATA = T_DATA
+}
+# endif
+# undef T_DATA
+# include <cairo-quartz.h>
+# define T_DATA RUBY_T_DATA
+#endif
+
#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE || CAIRO_HAS_SVG_SURFACE
# define HAS_CREATE_CR_CLOSURE_SURFACE 1
#else
More information about the cairo-commit
mailing list