Skip to content

Commit ef78a8b

Browse files
Merge pull request #13 from jpcy/fix-windows-zlib-path
Fix zlib header path on windows.
2 parents 5dede16 + b73fc88 commit ef78a8b

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

minizip/ioapi.h

+5
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@
4242

4343
#include <stdio.h>
4444
#include <stdlib.h>
45+
46+
#ifdef WIN32
47+
#include <QtZlib/zlib.h>
48+
#else
4549
#include <zlib.h>
50+
#endif
4651

4752
#if defined(USE_FILE32API)
4853
#define fopen64 fopen

minizip/unzip.c

+5
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,12 @@
7272
#define NOUNCRYPT
7373
#endif
7474

75+
#ifdef WIN32
76+
#include <QtZlib/zlib.h>
77+
#else
7578
#include <zlib.h>
79+
#endif
80+
7681
#include "unzip.h"
7782

7883
#ifdef STDC

minizip/unzip.h

+4
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,12 @@ extern "C" {
4848
#endif
4949

5050
#ifndef _ZLIB_H
51+
#ifdef WIN32
52+
#include <QtZlib/zlib.h>
53+
#else
5154
#include <zlib.h>
5255
#endif
56+
#endif
5357

5458
#ifndef _ZLIBIOAPI_H
5559
#include "ioapi.h"

0 commit comments

Comments
 (0)