psppire-output-window: Factor out output view as psppire-output-view.

[pspp] / src / libpspp / inflate.c

diff --git a/src/libpspp/inflate.c b/src/libpspp/inflate.c
index 478747843b743869bd596fd39b97bba85e64cd7b..afe64a63906b76f6af30e988e2244f4fdd47e8ad 100644 (file)
--- a/src/libpspp/inflate.c
+++ b/src/libpspp/inflate.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011, 2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,8 +19,6 @@
 
 #include "inflate.h"
 
-#if HAVE_ZLIB_H
-
 #include <xalloc.h>
 #include <zlib.h>
 #include <stdio.h>
@@ -99,6 +97,7 @@ inflate_init (struct zip_member *zm)
 int
 inflate_read (struct zip_member *zm, void *buf, size_t n)
 {
+  int r;
   struct inflator *inf = zm->aux;
 
   if (inf->zss.avail_in == 0)
@@ -134,7 +133,7 @@ inflate_read (struct zip_member *zm, void *buf, size_t n)
   inf->zss.avail_out = n;
   inf->zss.next_out = buf;
 
-  int r = inflate (&inf->zss, Z_NO_FLUSH);
+  r = inflate (&inf->zss, Z_NO_FLUSH);
   if ( Z_OK == r)
     {
       return n - inf->zss.avail_out;
@@ -144,5 +143,3 @@ inflate_read (struct zip_member *zm, void *buf, size_t n)
 
   return -1;
 }
-
-#endif