From 3de4a181eb53c73585ad192dce48cf7fef5022c3 Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Sun, 28 May 2017 08:35:58 -1000 Subject: [PATCH] Silence some build warnings on Android --- src/json_parse.c | 5 +---- src/video/gltouchkbd.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/json_parse.c b/src/json_parse.c index 7cf85d28..f431aee3 100644 --- a/src/json_parse.c +++ b/src/json_parse.c @@ -1101,9 +1101,6 @@ void json_destroy(JSON_ref *jsonRef) { FREE(parsedData->jsonString); FREE(parsedData->jsonTokens); -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers" - FREE(*jsonRef); -#pragma clang diagnostic pop + FREE(*((JSON_s **)jsonRef)); } diff --git a/src/video/gltouchkbd.c b/src/video/gltouchkbd.c index c6c9ec61..34ba36f6 100644 --- a/src/video/gltouchkbd.c +++ b/src/video/gltouchkbd.c @@ -711,7 +711,7 @@ static int64_t gltouchkbd_onTouchEvent(interface_touch_event_t action, int point static void _loadAltKbd(const char *kbdPath) { JSON_ref jsonRef = NULL; - json_unescapeSlashes(&kbdPath); + json_unescapeSlashes((char **)&kbdPath); int tokCount = json_createFromFile(kbdPath, &jsonRef); JSON_s parsedData = { 0 };