Skip to content

M
MariaDB
Commit a179b68f authored by marko's avatar marko
Browse files
Options

Rename the static page_zip_alloc() to page_zip_malloc() to resolve a clash.

parent dc4d3732
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
page/page0zip.c
View file @ a179b68f
...@@ -475,8 +475,8 @@ page_zip_dir_encode( ...@@ -475,8 +475,8 @@ page_zip_dir_encode(
Allocate memory for zlib. */ Allocate memory for zlib. */
static static
void* void*
page_zip_alloc( page_zip_malloc(
/*===========*/ /*============*/
void* opaque __attribute__((unused)), void* opaque __attribute__((unused)),
uInt items, uInt items,
uInt size) uInt size)
...@@ -571,7 +571,7 @@ page_zip_compress( ...@@ -571,7 +571,7 @@ page_zip_compress(
buf_end = buf + page_zip->size - PAGE_DATA; buf_end = buf + page_zip->size - PAGE_DATA;
/* Compress the data payload. */ /* Compress the data payload. */
c_stream.zalloc = page_zip_alloc; c_stream.zalloc = page_zip_malloc;
c_stream.zfree = page_zip_free; c_stream.zfree = page_zip_free;
c_stream.opaque = (voidpf) 0; c_stream.opaque = (voidpf) 0;
...@@ -1425,7 +1425,7 @@ page_zip_decompress( ...@@ -1425,7 +1425,7 @@ page_zip_decompress(
memcpy(page + (PAGE_NEW_SUPREMUM - REC_N_NEW_EXTRA_BYTES + 1), memcpy(page + (PAGE_NEW_SUPREMUM - REC_N_NEW_EXTRA_BYTES + 1),
supremum_extra_data, sizeof supremum_extra_data); supremum_extra_data, sizeof supremum_extra_data);
d_stream.zalloc = page_zip_alloc; d_stream.zalloc = page_zip_malloc;
d_stream.zfree = page_zip_free; d_stream.zfree = page_zip_free;
d_stream.opaque = (voidpf) 0; d_stream.opaque = (voidpf) 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7