diff options
| author | Colin Walters <walters@verbum.org> | 2013-01-07 12:57:17 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-01-07 12:57:17 -0500 |
| commit | f5631640751b5a998b3616db78dd5dcd9ee62126 (patch) | |
| tree | 8a91c5d99f4eec16f87a2b467cf6578a815f5261 /tests/scanner/regress.c | |
| parent | 9efe417e2e636df49ff6fb822dc84e7ce72a0ce1 (diff) | |
| download | gobject-introspection-f5631640751b5a998b3616db78dd5dcd9ee62126.tar.gz | |
Clean up cairo handling somewhat
I'm building on RHEL6 which doesn't have cairo-gobject. Now, we
tried to support this in that 'make' would succeed, but 'make check'
would blow up.
This patch allows more of 'make check' to succeed - I just need to
figure out how to make the diff against the -expected.gir work.
What's more important though, is this will allow gjs to also #define
_GI_DISABLE_CAIRO.
Diffstat (limited to 'tests/scanner/regress.c')
| -rw-r--r-- | tests/scanner/regress.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c index 06089c38..89dc8738 100644 --- a/tests/scanner/regress.c +++ b/tests/scanner/regress.c @@ -3,7 +3,6 @@ #include <stdlib.h> #include <glib-object.h> #include <gobject/gvaluecollector.h> -#include <cairo-gobject.h> #include "regress.h" @@ -285,6 +284,7 @@ regress_test_value_return(int i) /************************************************************************/ /* foreign structs */ +#ifndef _GI_DISABLE_CAIRO /** * regress_test_cairo_context_full_return: * @@ -365,6 +365,7 @@ regress_test_cairo_surface_full_out (cairo_surface_t **surface) { *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 10, 10); } +#endif /** * regress_test_gvariant_i: @@ -2298,6 +2299,7 @@ regress_test_obj_class_init (RegressTestObjClass *klass) 1, G_TYPE_OBJECT); +#ifndef _GI_DISABLE_CAIRO /** * RegressTestObj::sig-with-foreign-struct: * @self: an object @@ -2314,6 +2316,7 @@ regress_test_obj_class_init (RegressTestObjClass *klass) G_TYPE_NONE, 1, CAIRO_GOBJECT_TYPE_CONTEXT); +#endif regress_test_obj_signals[REGRESS_TEST_OBJ_SIGNAL_FIRST] = g_signal_new ("first", @@ -2620,6 +2623,7 @@ regress_test_obj_emit_sig_with_obj (RegressTestObj *obj) g_object_unref (obj_param); } +#ifndef _GI_DISABLE_CAIRO void regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj *obj) { @@ -2627,6 +2631,7 @@ regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj *obj) g_signal_emit_by_name (obj, "sig-with-foreign-struct", cr); cairo_destroy (cr); } +#endif void regress_test_obj_emit_sig_with_int64 (RegressTestObj *obj) |