diff options
| -rw-r--r-- | libqcdm/tests/test-qcdm.c | 5 | ||||
| -rw-r--r-- | libwmc/tests/test-wmc.c | 5 | ||||
| -rw-r--r-- | src/mm-serial-port.c | 8 | ||||
| -rw-r--r-- | src/tests/test-charsets.c | 5 | ||||
| -rw-r--r-- | src/tests/test-qcdm-serial-port.c | 4 |
5 files changed, 0 insertions, 27 deletions
diff --git a/libqcdm/tests/test-qcdm.c b/libqcdm/tests/test-qcdm.c index 35520c038..844836476 100644 --- a/libqcdm/tests/test-qcdm.c +++ b/libqcdm/tests/test-qcdm.c @@ -28,11 +28,7 @@ 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) @@ -127,4 +123,3 @@ int main (int argc, char **argv) return result; } - diff --git a/libwmc/tests/test-wmc.c b/libwmc/tests/test-wmc.c index a0e2e9ecc..e1027b2ec 100644 --- a/libwmc/tests/test-wmc.c +++ b/libwmc/tests/test-wmc.c @@ -27,11 +27,7 @@ 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) @@ -112,4 +108,3 @@ int main (int argc, char **argv) return result; } - diff --git a/src/mm-serial-port.c b/src/mm-serial-port.c index 57820c14c..f5d877477 100644 --- a/src/mm-serial-port.c +++ b/src/mm-serial-port.c @@ -1592,11 +1592,7 @@ set_property (GObject *object, guint prop_id, priv->bits = g_value_get_uint (value); break; case PROP_PARITY: -#if GLIB_CHECK_VERSION(2,31,0) priv->parity = g_value_get_schar (value); -#else - priv->parity = g_value_get_char (value); -#endif break; case PROP_STOPBITS: priv->stopbits = g_value_get_uint (value); @@ -1636,11 +1632,7 @@ get_property (GObject *object, guint prop_id, g_value_set_uint (value, priv->bits); break; case PROP_PARITY: -#if GLIB_CHECK_VERSION(2,31,0) g_value_set_schar (value, priv->parity); -#else - g_value_set_char (value, priv->parity); -#endif break; case PROP_STOPBITS: g_value_set_uint (value, priv->stopbits); diff --git a/src/tests/test-charsets.c b/src/tests/test-charsets.c index ced38a668..1c314133e 100644 --- a/src/tests/test-charsets.c +++ b/src/tests/test-charsets.c @@ -362,11 +362,7 @@ test_take_convert_ucs2_bad_ascii2 (void *f, gpointer d) } -#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) @@ -403,4 +399,3 @@ int main (int argc, char **argv) return result; } - diff --git a/src/tests/test-qcdm-serial-port.c b/src/tests/test-qcdm-serial-port.c index d61bdb431..11858383d 100644 --- a/src/tests/test-qcdm-serial-port.c +++ b/src/tests/test-qcdm-serial-port.c @@ -439,11 +439,7 @@ test_pty_cleanup (gpointer user_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) #define TESTCASE_PTY(t, d) g_test_create_case (#t, sizeof (*d), d, (TCFunc) test_pty_create, (TCFunc) t, (TCFunc) test_pty_cleanup) |