GNU bug report logs - #29848
27.0.50; [PATCH] Loading missing json_object_get on MS-Windows

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 29848 in the body.
You can then email your comments to 29848 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Chris Zheng <chriszheng99 <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: 27.0.50; [PATCH] Loading missing json_object_get on MS-Windows
Date: Tue, 26 Dec 2017 00:33:43 +0800

In master branch, with commit 3455192777459a08a38b0adb311a76202e29f48d,
the function json_object_get was called, which makes the build fail on
MinGW-w64. The following patch loads the missing function. Could you
please review and commit.

Thank you.



From ce54808800aed7c0b1eaa7170db47b1bf6c03ae1 Mon Sep 17 00:00:00 2001
From: Chris Zheng <chriszheng99 <at> gmail.com>
Date: Mon, 25 Dec 2017 23:56:13 +0800
Subject: [PATCH] Loading missing json_object_get on MS-Windows

* src/json.c [WINDOWSNT]: Define fn_json_object_get pointer.
(init_json_functions) [WINDOWSNT]: Load json_object_get.
---
 src/json.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/json.c b/src/json.c
index f615c4269f..88db86ad2e 100644
--- a/src/json.c
+++ b/src/json.c
@@ -60,6 +60,7 @@ DEF_DLL_FN (double, json_real_value, (const json_t *real));
 DEF_DLL_FN (const char *, json_string_value, (const json_t *string));
 DEF_DLL_FN (size_t, json_string_length, (const json_t *string));
 DEF_DLL_FN (json_t *, json_array_get, (const json_t *array, size_t index));
+DEF_DLL_FN (json_t *, json_object_get, (const json_t *object, const char *key));
 DEF_DLL_FN (size_t, json_object_size, (const json_t *object));
 DEF_DLL_FN (const char *, json_object_iter_key, (void *iter));
 DEF_DLL_FN (void *, json_object_iter, (json_t *object));
@@ -108,6 +109,7 @@ init_json_functions (void)
   LOAD_DLL_FN (library, json_string_value);
   LOAD_DLL_FN (library, json_string_length);
   LOAD_DLL_FN (library, json_array_get);
+  LOAD_DLL_FN (library, json_object_get);
   LOAD_DLL_FN (library, json_object_size);
   LOAD_DLL_FN (library, json_object_iter_key);
   LOAD_DLL_FN (library, json_object_iter);
@@ -141,6 +143,7 @@ init_json_functions (void)
 #define json_string_value fn_json_string_value
 #define json_string_length fn_json_string_length
 #define json_array_get fn_json_array_get
+#define json_object_get fn_json_object_get
 #define json_object_size fn_json_object_size
 #define json_object_iter_key fn_json_object_iter_key
 #define json_object_iter fn_json_object_iter
-- 
2.15.1.windows.2

Message #10 received at 29848-done <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Chris Zheng <chriszheng99 <at> gmail.com>
Cc: 29848-done <at> debbugs.gnu.org
Subject: Re: bug#29848: 27.0.50;
 [PATCH] Loading missing json_object_get on MS-Windows
Date: Mon, 25 Dec 2017 19:24:22 +0200

> Date: Tue, 26 Dec 2017 00:33:43 +0800
> From: Chris Zheng <chriszheng99 <at> gmail.com>
> 
> 
> 
> In master branch, with commit 3455192777459a08a38b0adb311a76202e29f48d,
> the function json_object_get was called, which makes the build fail on
> MinGW-w64. The following patch loads the missing function. Could you
> please review and commit.

Thanks, pushed.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.