From be28089dc4c1b07d9def45a3c763f432ae8322c4 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 9 Aug 2010 10:31:45 -0500 Subject: [PATCH] build: fix build with glib >= 2.25.12 (bgo #626421) Work around an API break in glib. --- libqcdm/tests/test-qcdm.c | 4 ++++ src/tests/test-modem-helpers.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libqcdm/tests/test-qcdm.c b/libqcdm/tests/test-qcdm.c index 86850802..4e6f0cfe 100644 --- a/libqcdm/tests/test-qcdm.c +++ b/libqcdm/tests/test-qcdm.c @@ -28,7 +28,11 @@ typedef struct { gpointer com_data; } TestData; +#if GLIB_CHECK_VERSION(2,25,12) +typedef GTestFixtureFunc TCFunc; +#else typedef void (*TCFunc)(void); +#endif #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL) diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c index 92a7af85..74d2d949 100644 --- a/src/tests/test-modem-helpers.c +++ b/src/tests/test-modem-helpers.c @@ -791,7 +791,11 @@ test_data_free (TestData *data) } +#if GLIB_CHECK_VERSION(2,25,12) +typedef GTestFixtureFunc TCFunc; +#else typedef void (*TCFunc)(void); +#endif #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL)