diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2017-12-10 18:36:37 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2017-12-10 18:36:37 +0200 |
| commit | 2b8a1b76920dbdfc39dab2ec29ab7650bf779275 (patch) | |
| tree | 2080a70b7238f63578d103dae8331e24840edc1c /lisp/term/w32-win.el | |
| parent | f856d1e4489eac45afab865838abb2b16fb1f14f (diff) | |
| download | emacs-2b8a1b76920dbdfc39dab2ec29ab7650bf779275.tar.gz | |
Support dynamic loading of libjansson on MS-Windows
* src/json.c [WINDOWSNT]: Define fn_* function pointers to jansson
functions.
(json_delete) [WINDOWSNT]: A wrapper around fn_json_delete, needed
by json_decref.
(init_json_functions) [WINDOWSNT]: New function.
(Fjson_serialize, Fjson_insert, Fjson_parse_string)
(Fjson_parse_buffer) [WINDOWSNT]: Call init_json_functions if
needed, and record JSON in Vlibrary_cache.
* src/emacs.c (main): Don't call init_json on WINDOWSNT.
* src/w32fns.c (syms_of_w32fns): DEFSYM "json".
* lisp/term/w32-win.el (dynamic-library-alist): Add JSON DLL to
the list.
* configure.ac (HAVE_JSON): Empty JSON_LIBS for MinGW.
* nt/INSTALL.W64:
* nt/INSTALL: Add information about libjansson.
Diffstat (limited to 'lisp/term/w32-win.el')
| -rw-r--r-- | lisp/term/w32-win.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 4e0e54ae179..1db90aec984 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -276,7 +276,8 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") '(gnutls "libgnutls-28.dll" "libgnutls-26.dll")) '(libxml2 "libxml2-2.dll" "libxml2.dll") '(zlib "zlib1.dll" "libz-1.dll") - '(lcms2 "liblcms2-2.dll"))) + '(lcms2 "liblcms2-2.dll") + '(json "libjansson-4.dll"))) ;;; multi-tty support (defvar w32-initialized nil |