aboutsummaryrefslogtreecommitdiffstats
path: root/src/decompress.c
diff options
context:
space:
mode:
authorK. Handa2015-01-07 22:51:41 +0900
committerK. Handa2015-01-07 22:51:41 +0900
commit88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch)
tree18da116400703b67738bdbbd38cc4abf4c1e929f /src/decompress.c
parent3f79d3131629f73da16ec121d2a0056f11b70e65 (diff)
parent95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff)
downloademacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz
emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/decompress.c')
-rw-r--r--src/decompress.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/decompress.c b/src/decompress.c
index f86aa6facbf..b14f0a2cd79 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -1,5 +1,5 @@
1/* Interface to zlib. 1/* Interface to zlib.
2 Copyright (C) 2013-2014 Free Software Foundation, Inc. 2 Copyright (C) 2013-2015 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
@@ -28,8 +28,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
28 28
29#include <verify.h> 29#include <verify.h>
30 30
31static Lisp_Object Qzlib_dll;
32
33#ifdef WINDOWSNT 31#ifdef WINDOWSNT
34# include <windows.h> 32# include <windows.h>
35# include "w32.h" 33# include "w32.h"