X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/118a31a3b1eb08cba14887c3134054e9b4383688..595195a10e5dd568bf249f5fb6778ae3d7037cd5:/src/decompress.c
diff --git a/src/decompress.c b/src/decompress.c
index b14f0a2cd7..6ebf74aaf5 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -1,12 +1,12 @@
/* Interface to zlib.
- Copyright (C) 2013-2015 Free Software Foundation, Inc.
+ Copyright (C) 2013-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,7 +23,6 @@ along with GNU Emacs. If not, see . */
#include
#include "lisp.h"
-#include "character.h"
#include "buffer.h"
#include
@@ -43,7 +42,7 @@ static bool zlib_initialized;
static bool
init_zlib_functions (void)
{
- HMODULE library = w32_delayed_load (Qzlib_dll);
+ HMODULE library = w32_delayed_load (Qzlib);
if (!library)
return false;
@@ -92,7 +91,7 @@ DEFUN ("zlib-available-p", Fzlib_available_p, Szlib_available_p, 0, 0, 0,
(void)
{
#ifdef WINDOWSNT
- Lisp_Object found = Fassq (Qzlib_dll, Vlibrary_cache);
+ Lisp_Object found = Fassq (Qzlib, Vlibrary_cache);
if (CONSP (found))
return XCDR (found);
else
@@ -100,7 +99,7 @@ DEFUN ("zlib-available-p", Fzlib_available_p, Szlib_available_p, 0, 0, 0,
Lisp_Object status;
zlib_initialized = init_zlib_functions ();
status = zlib_initialized ? Qt : Qnil;
- Vlibrary_cache = Fcons (Fcons (Qzlib_dll, status), Vlibrary_cache);
+ Vlibrary_cache = Fcons (Fcons (Qzlib, status), Vlibrary_cache);
return status;
}
#else
@@ -209,7 +208,6 @@ This function can be called only in unibyte buffers. */)
void
syms_of_decompress (void)
{
- DEFSYM (Qzlib_dll, "zlib");
defsubr (&Szlib_decompress_region);
defsubr (&Szlib_available_p);
}