diff options
author | Yann Collet <Cyan4973@users.noreply.github.com> | 2019-04-16 20:55:28 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-16 20:55:28 (GMT) |
commit | 131896ab9d4fc9b8c606616327ed223d5d86472b (patch) | |
tree | 4e6e76a7cfa572008dec5d7f18fce6394f3691ba /lib/lz4frame.c | |
parent | f1226ac53dee1b41a801e8003bb3708a2e671d12 (diff) | |
parent | d25b6d640132bb25a3db9617a8708d31701402f5 (diff) | |
download | lz4-1.9.0.zip lz4-1.9.0.tar.gz lz4-1.9.0.tar.bz2 |
Merge pull request #673 from lz4/devv1.9.0
minor update for v1.9.0
Diffstat (limited to 'lib/lz4frame.c')
-rw-r--r-- | lib/lz4frame.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/lz4frame.c b/lib/lz4frame.c index 19efd0b..42124e9 100644 --- a/lib/lz4frame.c +++ b/lib/lz4frame.c @@ -72,15 +72,15 @@ * by modifying below section. */ #include <stdlib.h> /* malloc, calloc, free */ -#define ALLOC(s) malloc(s) #ifndef LZ4_SRC_INCLUDED /* avoid redefinition when sources are coalesced */ -# define ALLOC_AND_ZERO(s) calloc(1,(s)) +# define ALLOC(s) malloc(s) +# define ALLOC_AND_ZERO(s) calloc(1,(s)) +# define FREEMEM(p) free(p) #endif -#define FREEMEM(p) free(p) #include <string.h> /* memset, memcpy, memmove */ #ifndef LZ4_SRC_INCLUDED /* avoid redefinition when sources are coalesced */ -# define MEM_INIT memset +# define MEM_INIT(p,v,s) memset((p),(v),(s)) #endif |