mirrors/libmicrohttpd
2
0 Fork 0
mirror of https://git.gnunet.org/libmicrohttpd.git synced 2026-10-07 04:02:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

memorypool: fixed build with VC, minor fixes

Browse Source
This commit is contained in:
Evgeny Grin (Karlson2k) committed 2019-06-13 13:04:36 +03:00
1 parent 2c54092e7e
commit 04d8449af5
1 file changed
+4 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/microhttpd/memorypool.c
+4 -5
View File
@@ -33,7 +33,7 @@
#include <sys/mman.h>
#endif
#ifdef _WIN32
#include <memoryapi.h>
#include <windows.h>
#endif
/* define MAP_ANONYMOUS for Mac OS X */
@@ -42,7 +42,7 @@
#endif
#if defined(_WIN32)
#define MAP_FAILED NULL
#elif ! defined(MAP_FAILED)
#elif !defined(MAP_FAILED)
#define MAP_FAILED ((void*)-1)
#endif
@@ -126,8 +126,7 @@ MHD_pool_create (size_t max)
#else
pool->memory = MAP_FAILED;
#endif
if ( (MAP_FAILED == pool->memory) ||
(NULL == pool->memory))
if (MAP_FAILED == pool->memory)
{
pool->memory = malloc (max);
if (NULL == pool->memory)
@@ -285,7 +284,7 @@ MHD_pool_reallocate (struct MemoryPool *pool,
pool->pos = new_apos;
/* Zero-out unused part if shrinking */
if (old_size > new_size)
memset (old + new_size, 0, old_size - new_size);
memset ((uint8_t*)old + new_size, 0, old_size - new_size);
return old;
}
}