summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gmail.com>2020-08-24 16:18:18 +0000
committerEmmanuele Bassi <ebassi@gmail.com>2020-08-24 16:18:18 +0000
commit1bfdc6534dd3ba90aa5564af10df178af834221e (patch)
tree2696ee53ab7319081333233069782f645bc1ec05
parenta697f050bac783d4f1dadfaf4d7407e003a94bef (diff)
parent8c5fabe962b7337066dac7a697d23fce257a5d64 (diff)
downloadjson-glib-1bfdc6534dd3ba90aa5564af10df178af834221e.tar.gz
Merge branch 'clang11' into 'master'
Unbreak build with Clang 11 See merge request GNOME/json-glib!29
-rw-r--r--json-glib/json-scanner.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/json-glib/json-scanner.c b/json-glib/json-scanner.c
index 0c9919f..59dd29c 100644
--- a/json-glib/json-scanner.c
+++ b/json-glib/json-scanner.c
@@ -925,7 +925,7 @@ json_scanner_get_token_i (JsonScanner *scanner,
case G_TOKEN_SYMBOL:
if (scanner->config->symbol_2_token)
- *token_p = (GTokenType) value_p->v_symbol;
+ *token_p = GPOINTER_TO_INT (value_p->v_symbol);
break;
case G_TOKEN_BINARY: