colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: remove unneeded GLIB_CHECK_VERSION checks, 2.32 already required

Browse Source
This commit is contained in:
Aleksander Morgado
2013-06-18 16:55:29 +02:00
parent a33e9671ea
commit 2a922f836d
5 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libqcdm/tests/test-qcdm.c
View File

@@ -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;
}

5
libwmc/tests/test-wmc.c
View File

@@ -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;
}

8
src/mm-serial-port.c
View File

@@ -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);

5
src/tests/test-charsets.c
View File

@@ -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;
}

4
src/tests/test-qcdm-serial-port.c
View File

@@ -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)