/Users/proj/soft/ilcsoft/Qt5/tmp diff -uNr v5.15.2.ORIG/Qt5/qt3d/src/3rdparty/assimp/contrib/zip/src/miniz.h v5.15.2/Qt5/qt3d/src/3rdparty/assimp/contrib/zip/src/miniz.h --- v5.15.2.ORIG/Qt5/qt3d/src/3rdparty/assimp/contrib/zip/src/miniz.h 2022-03-04 17:31:10.000000000 +0900 +++ v5.15.2/Qt5/qt3d/src/3rdparty/assimp/contrib/zip/src/miniz.h 2022-04-12 20:52:13.000000000 +0900 @@ -200,12 +200,12 @@ #include #endif -#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__i386) || defined(__i486__) || defined(__i486) || defined(i386) || defined(__ia64__) || defined(__x86_64__) +#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__i386) || defined(__i486__) || defined(__i486) || defined(i386) || defined(__ia64__) || defined(__x86_64__) || defined(__arm64__) // MINIZ_X86_OR_X64_CPU is only used to help set the below macros. #define MINIZ_X86_OR_X64_CPU 1 #endif -#if (__BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__) || MINIZ_X86_OR_X64_CPU +#if (__BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__) || MINIZ_X86_OR_X64_CPU || defined(__APPLE__) // Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian. #define MINIZ_LITTLE_ENDIAN 1 #endif @@ -215,7 +215,7 @@ #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0 #endif -#if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__) || defined(__ia64__) || defined(__x86_64__) +#if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__) || defined(__ia64__) || defined(__x86_64__) || defined(__arm64__) // Set MINIZ_HAS_64BIT_REGISTERS to 1 if operations on 64-bit integers are reasonably fast (and don't involve compiler generated calls to helper functions). #define MINIZ_HAS_64BIT_REGISTERS 1 #endif @@ -2917,7 +2917,7 @@ #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(__APPLE__) #ifndef MINIZ_NO_TIME #include #endif