packager.h in xlsxwriter-0.0.4.pre.2

- old
+ new

@@ -8,12 +8,17 @@
  */
 #ifndef __LXW_PACKAGER_H__
 #define __LXW_PACKAGER_H__
 
 #include <stdint.h>
-#include "xlsxwriter/third_party/zip.h"
 
+#ifdef USE_SYSTEM_MINIZIP
+#include "minizip/zip.h"
+#else
+#include "third_party/zip.h"
+#endif
+
 #include "common.h"
 #include "workbook.h"
 #include "worksheet.h"
 #include "shared_strings.h"
 #include "app.h"
@@ -25,11 +30,11 @@
 #include "content_types.h"
 #include "relationships.h"
 
 #define LXW_ZIP_BUFFER_SIZE (16384)
 
-/*  * If zlib returns Z_ERRNO then errno is set and we can trap that. Otherwise
+/* If zlib returns Z_ERRNO then errno is set and we can trap that. Otherwise
  * return a default libxlsxwriter error. */
 #define RETURN_ON_ZIP_ERROR(err, default_err)   \
     if (err == Z_ERRNO)                         \
         return LXW_ERROR_ZIP_FILE_OPERATION;    \
     else                                        \
@@ -62,10 +67,10 @@
 #endif
 /* *INDENT-ON* */
 
 lxw_packager *lxw_packager_new(const char *filename, char *tmpdir);
 void lxw_packager_free(lxw_packager *packager);
-uint8_t lxw_create_package(lxw_packager *self);
+lxw_error lxw_create_package(lxw_packager *self);
 
 /* Declarations required for unit testing. */
 #ifdef TESTING
 
 #endif /* TESTING */