psppire-output-view: Use correct enumeration type in call.

[pspp] / src / libpspp / zip-reader.h

diff --git a/src/libpspp/zip-reader.h b/src/libpspp/zip-reader.h
index 966bd5990f25adf1cc37c0879fad05aba3038b4e..6277b768e041939659d9b9185c23eb46be7f754e 100644 (file)
--- a/src/libpspp/zip-reader.h
+++ b/src/libpspp/zip-reader.h
@@ -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
@@ -26,9 +26,7 @@ struct string;
 enum compression
   {
     COMPRESSION_STORED = 0,
-#if HAVE_ZLIB_H
     COMPRESSION_INFLATE,
-#endif
     n_COMPRESSION
   };
 
@@ -45,7 +43,8 @@ struct zip_member
 
   size_t bytes_unread;       /* Number of bytes left in the member available for reading */
   int ref_cnt;
-  struct string *errs;
+  struct string *errmsgs;    /* A string to hold error messages.
+                               This string is NOT owned by this object. */
   void *aux;
 };
 
@@ -71,7 +70,7 @@ void zip_reader_destroy (struct zip_reader *zr);
 /* Return the zip member in the reader ZR, called MEMBER */
 struct zip_member *zip_member_open (struct zip_reader *zr, const char *member);
 
-/* Read upto N bytes from ZM, storing them in BUF.
+/* Read up to N bytes from ZM, storing them in BUF.
    Returns the number of bytes read, or -1 on error */
 int zip_member_read (struct zip_member *zm, void *buf, size_t n);