diff options
Diffstat (limited to 'o3d/import/cross/zip_archive.h')
| -rw-r--r-- | o3d/import/cross/zip_archive.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/o3d/import/cross/zip_archive.h b/o3d/import/cross/zip_archive.h index 4c55539..aa3f9bc 100644 --- a/o3d/import/cross/zip_archive.h +++ b/o3d/import/cross/zip_archive.h @@ -108,11 +108,12 @@ #include <string> #include <vector> -#ifdef OS_MACOSX -#define unix -#endif +#include "contrib/minizip/unzip.h" -#include "third_party/zlib/files/contrib/minizip/unzip.h" +#if defined(OS_WIN) +// Windows #defines this. +#undef DeleteFile +#endif // structure containing the unz_file_info information plus the file name struct ZipFileInfo : public unz_file_info { |