From ab92f50fa8e41b359c758f1ac27aef34131ba814 Mon Sep 17 00:00:00 2001 From: Charlie Gettys Date: Wed, 27 Mar 2019 11:28:37 -0400 Subject: [PATCH] Add upstreamed change to miniz.h --- contrib/zip/src/miniz.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h index 0e269d18a..2c27a94d8 100644 --- a/contrib/zip/src/miniz.h +++ b/contrib/zip/src/miniz.h @@ -281,10 +281,15 @@ #define MINIZ_LITTLE_ENDIAN 1 #endif +/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES only if not set */ +#if !defined(MINIZ_USE_UNALIGNED_LOADS_AND_STORES) #if MINIZ_X86_OR_X64_CPU -// Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient -// integer loads and stores from unaligned addresses. +/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses. */ #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 +#define MINIZ_UNALIGNED_USE_MEMCPY +#else +#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0 +#endif #endif #if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || \