24 lines
841 B
Plaintext
24 lines
841 B
Plaintext
|
|
From cbe4a359a377c03c2036f7e9474faa84e58a5a10 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Mon, 11 Feb 2019 15:57:25 +1000
|
|
Subject: Fix build qt3d zip module
|
|
|
|
|
|
diff --git a/src/3rdparty/assimp/contrib/zip/src/miniz.h b/src/3rdparty/assimp/contrib/zip/src/miniz.h
|
|
index 2e4e223..6436df5 100644
|
|
--- a/src/3rdparty/assimp/contrib/zip/src/miniz.h
|
|
+++ b/src/3rdparty/assimp/contrib/zip/src/miniz.h
|
|
@@ -2917,7 +2917,7 @@ void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h,
|
|
#define MZ_FFLUSH fflush
|
|
#define MZ_FREOPEN(f, m, s) freopen(f, m, s)
|
|
#define MZ_DELETE_FILE remove
|
|
- #elif defined(__GNUC__) && _LARGEFILE64_SOURCE
|
|
+ #elif defined(__GNUC__) && _LARGEFILE64_SOURCE && !defined(__HAIKU__)
|
|
#ifndef MINIZ_NO_TIME
|
|
#include <utime.h>
|
|
#endif
|
|
--
|
|
2.28.0
|
|
|