summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <Cyan4973@users.noreply.github.com>2019-04-17 17:43:38 (GMT)
committerGitHub <noreply@github.com>2019-04-17 17:43:38 (GMT)
commitb59fd652e80f3dc494ed80cc2521f7777c85a0dd (patch)
treee723c373be678a9b211e7734da01b079c457c4b7
parent5dde00e5d33eb617673f62191781907468beadb7 (diff)
parentc329ab1d7b569aced0c01c737140dcdce32946c1 (diff)
downloadlz4-b59fd652e80f3dc494ed80cc2521f7777c85a0dd.zip
lz4-b59fd652e80f3dc494ed80cc2521f7777c85a0dd.tar.gz
lz4-b59fd652e80f3dc494ed80cc2521f7777c85a0dd.tar.bz2
Merge pull request #674 from nrgiii/dev
Fix
-rw-r--r--lib/lz4.c6
-rw-r--r--tests/fuzzer.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/lz4.c b/lib/lz4.c
index 693bdaf..bd8fa11 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -98,8 +98,14 @@
# define LZ4_SRC_INCLUDED 1
#endif
+#ifndef LZ4_STATIC_LINKING_ONLY
#define LZ4_STATIC_LINKING_ONLY
+#endif
+
+#ifndef LZ4_DISABLE_DEPRECATE_WARNINGS
#define LZ4_DISABLE_DEPRECATE_WARNINGS /* due to LZ4_decompress_safe_withPrefix64k */
+#endif
+
#include "lz4.h"
/* see also "memory routines" below */
diff --git a/tests/fuzzer.c b/tests/fuzzer.c
index 3128e6d..68e2232 100644
--- a/tests/fuzzer.c
+++ b/tests/fuzzer.c
@@ -50,6 +50,10 @@
#include <assert.h>
#include <limits.h> /* INT_MAX */
+#if defined(_AIX)
+# include <sys/mman.h> /* mmap */
+#endif
+
#define LZ4_DISABLE_DEPRECATE_WARNINGS /* LZ4_decompress_fast */
#define LZ4_STATIC_LINKING_ONLY
#include "lz4.h"