[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master cf13450: Fix MS-Windows build broken by recent chan
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master cf13450: Fix MS-Windows build broken by recent changes in json.c |
Date: |
Mon, 25 Dec 2017 12:23:47 -0500 (EST) |
branch: master
commit cf13450db84d507ef1d5d32e56345ecf0bd5c592
Author: Chris Zheng <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix MS-Windows build broken by recent changes in json.c
* src/json.c [WINDOWSNT] (fn_json_object_get): Define.
(init_json_functions) [WINDOWSNT]: Load json_object_get from DLL.
(Bug#29848)
Copyright-paperwork-exempt: yes
---
src/json.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/json.c b/src/json.c
index f615c42..88db86a 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master cf13450: Fix MS-Windows build broken by recent changes in json.c,
Eli Zaretskii <=