Manually re-apply libxlsxwriter customizations to minizip

jmcnamara · Nov 18, 2023 · 7e8e9c0 · 7e8e9c0
1 parent 957ed5c
commit 7e8e9c0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/third_party/minizip/ioapi.h b/third_party/minizip/ioapi.h
@@ -18,6 +18,12 @@
 
 */
 
+
+/* Pragma added by libxlsxwriter to avoid warnings with -pedantic -ansi. */
+#ifndef _WIN32
+#pragma GCC system_header
+#endif
+
 #ifndef _ZLIBIOAPI64_H
 #define _ZLIBIOAPI64_H
 

diff --git a/third_party/minizip/zip.h b/third_party/minizip/zip.h
@@ -37,6 +37,11 @@
 
 */
 
+/* Pragma added by libxlsxwriter to avoid warnings with -pedantic -ansi. */
+#ifndef _WIN32
+#pragma GCC system_header
+#endif
+
 #ifndef _zip12_H
 #define _zip12_H
 
@@ -54,6 +59,14 @@ extern "C" {
 #include "ioapi.h"
 #endif
 
+/* Encryption not required by libxlsxwriter. */
+#ifndef NOCRYPT
+#define NOCRYPT
+#endif
+#ifndef NOUNCRYPT
+#define NOUNCRYPT
+#endif
+
 #ifdef HAVE_BZIP2
 #include "bzlib.h"
 #endif