projects / packages / ModemManager.git / blame
| Commit | Line | Data |
|---|---|---|
| 9aac38b4 SS |
1 | From be28089dc4c1b07d9def45a3c763f432ae8322c4 Mon Sep 17 00:00:00 2001 |
| 2 | From: Vincent Untz <vuntz@gnome.org> | |
| 3 | Date: Mon, 09 Aug 2010 15:31:45 +0000 | |
| 4 | Subject: build: fix build with glib >= 2.25.12 (bgo #626421) | |
| 5 | ||
| 6 | Work around an API break in glib. | |
| 7 | --- | |
| 8 | diff --git a/libqcdm/tests/test-qcdm.c b/libqcdm/tests/test-qcdm.c | |
| 9 | index 8685080..4e6f0cf 100644 | |
| 10 | --- a/libqcdm/tests/test-qcdm.c | |
| 11 | +++ b/libqcdm/tests/test-qcdm.c | |
| 12 | @@ -28,7 +28,11 @@ typedef struct { | |
| 13 | gpointer com_data; | |
| 14 | } TestData; | |
| 15 | ||
| 16 | +#if GLIB_CHECK_VERSION(2,25,12) | |
| 17 | +typedef GTestFixtureFunc TCFunc; | |
| 18 | +#else | |
| 19 | typedef void (*TCFunc)(void); | |
| 20 | +#endif | |
| 21 | ||
| 22 | #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL) | |
| 23 | ||
| 24 | diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c | |
| 25 | index 92a7af8..74d2d94 100644 | |
| 26 | --- a/src/tests/test-modem-helpers.c | |
| 27 | +++ b/src/tests/test-modem-helpers.c | |
| 28 | @@ -791,7 +791,11 @@ test_data_free (TestData *data) | |
| 29 | } | |
| 30 | ||
| 31 | ||
| 32 | +#if GLIB_CHECK_VERSION(2,25,12) | |
| 33 | +typedef GTestFixtureFunc TCFunc; | |
| 34 | +#else | |
| 35 | typedef void (*TCFunc)(void); | |
| 36 | +#endif | |
| 37 | ||
| 38 | #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL) | |
| 39 | ||
| 40 | -- | |
| 41 | cgit v0.8.3-6-g21f6 |