diff options
Diffstat (limited to 'shell/inc')
| -rw-r--r-- | shell/inc/internal/types.hxx | 7 | ||||
| -rw-r--r-- | shell/inc/internal/zipfile.hxx | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx index a806d02768dd..0c6810aec0d0 100644 --- a/shell/inc/internal/types.hxx +++ b/shell/inc/internal/types.hxx @@ -34,9 +34,14 @@ #include <utility> #include <vector> #include <stack> + +#if defined SYSTEM_ZLIB +#include <zlib.h> +#include <minizip/ioapi.h> +#else #include <external/zlib/zlib.h> #include <external/zlib/ioapi.h> - +#endif typedef std::vector<std::wstring> StringList_t; diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx index 6d8d24b0538c..062ce38cf1af 100644 --- a/shell/inc/internal/zipfile.hxx +++ b/shell/inc/internal/zipfile.hxx @@ -33,9 +33,11 @@ #define _WINDOWS #endif - +#if defined SYSTEM_ZLIB +#include <minizip/unzip.h> +#else #include <external/zlib/unzip.h> - +#endif #include <string> #include <vector> |