diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-08-12 16:15:01 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-08-12 16:15:01 +0300 |
| commit | 594a430782d12499543637915fd974483523f500 (patch) | |
| tree | ed3011bd979d4ed2aedee2fe19effb0ef00450bd /lisp | |
| parent | 7a67e06b99a85ae700a7ccc75468397d53af59ed (diff) | |
| download | emacs-594a430782d12499543637915fd974483523f500.tar.gz | |
Fix build with zlib on MS-Windows.
configure.ac (LIBZ): Comment on w32 peculiarities regarding LIBZ.
src/decompress.c [WINDOWSNT]: Include windows.h and w32.h.
(DEF_ZLIB_FN, LOAD_ZLIB_FN) [WINDOWSNT]: New macros. Use them to
define static variables that are pointers to zlib functions to be
dynamically loaded.
(init_zlib_functions) [WINDOWSNT]: New function.
(fn_inflateInit2_, fn_inflate, fn_inflateEnd, fn_inflateInit2):
New macros.
(Fdecompress_gzipped_region, unwind_decompress): Use the fn_*
macros instead of invoking the zlib functions directly.
(syms_of_decompress): DEFSYM Qzlib_dll. Staticpro
Szlib_available_p.
lisp/term/w32-win.el (dynamic-library-alist): Add DLLs for zlib.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1b7aceb5979..8d838622680 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-08-12 Eli Zaretskii <eliz@gnu.org> + + * term/w32-win.el (dynamic-library-alist): Add DLLs for zlib. + 2013-08-12 Glenn Morris <rgm@gnu.org> * format.el (format-annotate-function): diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index acadb0fad43..55181ab7d6d 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -229,7 +229,8 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") '(glib "libglib-2.0-0.dll") '(gobject "libgobject-2.0-0.dll") '(gnutls "libgnutls-28.dll" "libgnutls-26.dll") - '(libxml2 "libxml2-2.dll" "libxml2.dll"))) + '(libxml2 "libxml2-2.dll" "libxml2.dll") + '(zlib "zlib1.dll" "libz-1.dll"))) ;;; multi-tty support (defvar w32-initialized nil |