mirror of
https://github.com/jmcnamara/libxlsxwriter
synced 2025-03-28 21:13:14 +00:00
Manually re-apply libxlsxwriter customizations to minizip
This commit is contained in:
parent
e7f863c2b8
commit
4e2c9cb262
6
third_party/minizip/ioapi.h
vendored
6
third_party/minizip/ioapi.h
vendored
@ -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
|
||||
|
||||
|
13
third_party/minizip/zip.h
vendored
13
third_party/minizip/zip.h
vendored
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user