From d2c28fab135742b98466345f933c2f0c1608569c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 17 Aug 2013 20:18:07 +0300 Subject: [PATCH] Fix a minor issue with loading zlib DLL on MS-Windows. src/decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value of zlib_initialized according to the results of calling init_zlib_functions. --- src/ChangeLog | 6 ++++++ src/decompress.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 013e181c40..7a875ae63b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-08-17 Eli Zaretskii + + * decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value + of zlib_initialized according to the results of calling + init_zlib_functions. + 2013-08-16 Lars Magne Ingebrigtsen * image.c: Implement an ImageMagick per-image cache. diff --git a/src/decompress.c b/src/decompress.c index 0212354fc8..c49f39a8ba 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -116,7 +116,8 @@ DEFUN ("zlib-available-p", Fzlib_available_p, Szlib_available_p, 0, 0, 0, else { Lisp_Object status; - status = init_zlib_functions () ? Qt : Qnil; + zlib_initialized = init_zlib_functions (); + status = zlib_initialized ? Qt : Qnil; Vlibrary_cache = Fcons (Fcons (Qzlib_dll, status), Vlibrary_cache); return status; } -- 2.20.1