haiwen/libsearpc
1
0
Fork 0
mirror of https://github.com/haiwen/libsearpc.git synced 2025-09-02 13:25:25 +00:00
Code Issues Releases Wiki Activity

fallback g_value_set_schar to g_value_set_char for glib<2.32

Browse Source
This commit is contained in:
lins05
2013-12-19 10:47:27 +08:00
parent f8045eaee3
commit 6110ad3cbc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/searpc-utils.c
View File

@@ -4,6 +4,11 @@
#include "searpc-utils.h" #include "searpc-utils.h"
#if !GLIB_CHECK_VERSION(2, 32, 0)
#define g_value_set_schar g_value_set_char
#define g_value_get_schar g_value_get_char
#endif
static json_t *json_serialize_pspec (const GValue *value) static json_t *json_serialize_pspec (const GValue *value)
{ {
/* Only types in json-glib but G_TYPE_BOXED */ /* Only types in json-glib but G_TYPE_BOXED */
@@ -32,8 +37,7 @@ static json_t *json_serialize_pspec (const GValue *value)
case G_TYPE_DOUBLE: case G_TYPE_DOUBLE:
return json_real (g_value_get_double (value)); return json_real (g_value_get_double (value));
case G_TYPE_CHAR: case G_TYPE_CHAR:
/* FIXME: here we should use g_value_get_schar */ return json_integer (g_value_get_schar (value));
return json_integer (g_value_get_char (value));
case G_TYPE_UCHAR: case G_TYPE_UCHAR:
return json_integer (g_value_get_uchar (value)); return json_integer (g_value_get_uchar (value));
case G_TYPE_ENUM: case G_TYPE_ENUM:
@@ -110,8 +114,7 @@ static gboolean json_deserialize_pspec (GValue *value, GParamSpec *pspec, json_t
json_int_t int_value = json_integer_value (node); json_int_t int_value = json_integer_value (node);
switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (value))) { switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (value))) {
case G_TYPE_CHAR: case G_TYPE_CHAR:
/* FIXME: here we should use g_value_set_schar */ g_value_set_schar(value, (gchar)int_value);
g_value_set_char(value, (gchar)int_value);
return TRUE; return TRUE;
case G_TYPE_UCHAR: case G_TYPE_UCHAR:
g_value_set_uchar (value, (guchar)int_value); g_value_set_uchar (value, (guchar)int_value);