[vala] glib-2.0: Use correct GTest*Func bindings on GLib >= 2.26
- From: JÃrg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] glib-2.0: Use correct GTest*Func bindings on GLib >= 2.26
- Date: Thu, 26 Apr 2012 09:59:45 +0000 (UTC)
commit fd7cbef58772696311f3a9d89816a5da6422ff7c
Author: JÃrg Billeter <j bitron ch>
Date: Thu Apr 26 11:58:43 2012 +0200
glib-2.0: Use correct GTest*Func bindings on GLib >= 2.26
vapi/glib-2.0.vapi | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 2902127..51ce56b 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -3706,7 +3706,11 @@ namespace GLib {
public static bool verbose ();
public static bool quiet ();
public static int run ();
+#if GLIB_2_26
+ public static void add_func (string testpath, TestFunc test_funcvoid);
+#else
public static void add_func (string testpath, Callback test_funcvoid);
+#endif
public static void add_data_func (string testpath, [CCode (delegate_target_pos = 1.9)] TestDataFunc test_funcvoid);
[PrintfFormat]
public static void message (string format, ...);
@@ -3738,7 +3742,11 @@ namespace GLib {
[CCode (cname = "GTestCase", ref_function = "", unref_function = "")]
public class TestCase {
[CCode (cname = "g_test_create_case")]
+#if GLIB_2_26
+ public TestCase (string test_name, [CCode (delegate_target_pos = 1.9)] TestFixtureFunc data_setup, [CCode (delegate_target_pos = 1.9)] TestFixtureFunc data_func, [CCode (delegate_target_pos = 1.9)] TestFixtureFunc data_teardown, [CCode (pos = 1.8)] size_t data_size = 0);
+#else
public TestCase (string test_name, [CCode (delegate_target_pos = 1.9, type = "void (*) (void)")] TestFunc data_setup, [CCode (delegate_target_pos = 1.9, type = "void (*) (void)")] TestFunc data_func, [CCode (delegate_target_pos = 1.9, type = "void (*) (void)")] TestFunc data_teardown, [CCode (pos = 1.8)] size_t data_size = 0);
+#endif
}
[Compact]
@@ -3754,8 +3762,15 @@ namespace GLib {
public void add_suite (TestSuite test_suite);
}
+#if GLIB_2_26
+ [CCode (has_target = false)]
+ public delegate void TestFunc ();
+ public delegate void TestDataFunc ();
+ public delegate void TestFixtureFunc (void* fixture);
+#else
public delegate void TestFunc (void* fixture);
public delegate void TestDataFunc ();
+#endif
[Flags]
[CCode (cprefix = "G_TEST_TRAP_", has_type_id = false)]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]