aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2017-12-10 18:36:37 +0200
committerEli Zaretskii2017-12-10 18:36:37 +0200
commit2b8a1b76920dbdfc39dab2ec29ab7650bf779275 (patch)
tree2080a70b7238f63578d103dae8331e24840edc1c /lisp
parentf856d1e4489eac45afab865838abb2b16fb1f14f (diff)
downloademacs-2b8a1b76920dbdfc39dab2ec29ab7650bf779275.tar.gz
emacs-2b8a1b76920dbdfc39dab2ec29ab7650bf779275.zip
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')
-rw-r--r--lisp/term/w32-win.el3
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.")
276 '(gnutls "libgnutls-28.dll" "libgnutls-26.dll")) 276 '(gnutls "libgnutls-28.dll" "libgnutls-26.dll"))
277 '(libxml2 "libxml2-2.dll" "libxml2.dll") 277 '(libxml2 "libxml2-2.dll" "libxml2.dll")
278 '(zlib "zlib1.dll" "libz-1.dll") 278 '(zlib "zlib1.dll" "libz-1.dll")
279 '(lcms2 "liblcms2-2.dll"))) 279 '(lcms2 "liblcms2-2.dll")
280 '(json "libjansson-4.dll")))
280 281
281;;; multi-tty support 282;;; multi-tty support
282(defvar w32-initialized nil 283(defvar w32-initialized nil