diff options
| author | Chris Zheng | 2017-12-25 19:21:58 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2017-12-25 19:21:58 +0200 |
| commit | cf13450db84d507ef1d5d32e56345ecf0bd5c592 (patch) | |
| tree | 56f92bfdde3a2b03ba5bf7403664eef4270247cc /src/json.c | |
| parent | 448eebcccee723a3c528a4fd03b4eb684f700f22 (diff) | |
| download | emacs-cf13450db84d507ef1d5d32e56345ecf0bd5c592.tar.gz emacs-cf13450db84d507ef1d5d32e56345ecf0bd5c592.zip | |
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
Diffstat (limited to 'src/json.c')
| -rw-r--r-- | src/json.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/json.c b/src/json.c index f615c4269f1..88db86ad2e3 100644 --- a/src/json.c +++ b/src/json.c | |||
| @@ -60,6 +60,7 @@ DEF_DLL_FN (double, json_real_value, (const json_t *real)); | |||
| 60 | DEF_DLL_FN (const char *, json_string_value, (const json_t *string)); | 60 | DEF_DLL_FN (const char *, json_string_value, (const json_t *string)); |
| 61 | DEF_DLL_FN (size_t, json_string_length, (const json_t *string)); | 61 | DEF_DLL_FN (size_t, json_string_length, (const json_t *string)); |
| 62 | DEF_DLL_FN (json_t *, json_array_get, (const json_t *array, size_t index)); | 62 | DEF_DLL_FN (json_t *, json_array_get, (const json_t *array, size_t index)); |
| 63 | DEF_DLL_FN (json_t *, json_object_get, (const json_t *object, const char *key)); | ||
| 63 | DEF_DLL_FN (size_t, json_object_size, (const json_t *object)); | 64 | DEF_DLL_FN (size_t, json_object_size, (const json_t *object)); |
| 64 | DEF_DLL_FN (const char *, json_object_iter_key, (void *iter)); | 65 | DEF_DLL_FN (const char *, json_object_iter_key, (void *iter)); |
| 65 | DEF_DLL_FN (void *, json_object_iter, (json_t *object)); | 66 | DEF_DLL_FN (void *, json_object_iter, (json_t *object)); |
| @@ -108,6 +109,7 @@ init_json_functions (void) | |||
| 108 | LOAD_DLL_FN (library, json_string_value); | 109 | LOAD_DLL_FN (library, json_string_value); |
| 109 | LOAD_DLL_FN (library, json_string_length); | 110 | LOAD_DLL_FN (library, json_string_length); |
| 110 | LOAD_DLL_FN (library, json_array_get); | 111 | LOAD_DLL_FN (library, json_array_get); |
| 112 | LOAD_DLL_FN (library, json_object_get); | ||
| 111 | LOAD_DLL_FN (library, json_object_size); | 113 | LOAD_DLL_FN (library, json_object_size); |
| 112 | LOAD_DLL_FN (library, json_object_iter_key); | 114 | LOAD_DLL_FN (library, json_object_iter_key); |
| 113 | LOAD_DLL_FN (library, json_object_iter); | 115 | LOAD_DLL_FN (library, json_object_iter); |
| @@ -141,6 +143,7 @@ init_json_functions (void) | |||
| 141 | #define json_string_value fn_json_string_value | 143 | #define json_string_value fn_json_string_value |
| 142 | #define json_string_length fn_json_string_length | 144 | #define json_string_length fn_json_string_length |
| 143 | #define json_array_get fn_json_array_get | 145 | #define json_array_get fn_json_array_get |
| 146 | #define json_object_get fn_json_object_get | ||
| 144 | #define json_object_size fn_json_object_size | 147 | #define json_object_size fn_json_object_size |
| 145 | #define json_object_iter_key fn_json_object_iter_key | 148 | #define json_object_iter_key fn_json_object_iter_key |
| 146 | #define json_object_iter fn_json_object_iter | 149 | #define json_object_iter fn_json_object_iter |