ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-14 21:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

almost working windows build

Browse Source
This commit is contained in:
Mike Jerris committed 2015-09-04 12:58:46 -04:00
1 parent b434e2b7fe
commit 17f7afe76a
8 files changed
+286 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libs/libks/src/mpool.c
+8 -4
View File
@@ -37,7 +37,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifndef _MSC_VER
#include <unistd.h>
#endif
#include <sys/mman.h>
#ifdef DMALLOC
@@ -240,8 +242,9 @@ static void *alloc_pages(mpool_t *mp_p, const unsigned int page_n,
#ifdef DEBUG
(void)printf("allocating %u pages or %lu bytes\n", page_n, size);
#endif
if (BIT_IS_SET(mp_p->mp_flags, MPOOL_FLAG_USE_SBRK)) {
#ifndef WIN32
mem = sbrk(size);
if (mem == (void *)-1) {
SET_POINTER(error_p, MPOOL_ERROR_NO_MEM);
@@ -262,6 +265,7 @@ static void *alloc_pages(mpool_t *mp_p, const unsigned int page_n,
}
mem = (char *)mem + fill;
}
#endif
}
else {
state = MAP_PRIVATE;
@@ -273,7 +277,7 @@ static void *alloc_pages(mpool_t *mp_p, const unsigned int page_n,
#endif
/* mmap from /dev/zero */
mem = mmap((caddr_t)mp_p->mp_addr, size, mp_p->mp_mmflags, state,
mem = mmap(mp_p->mp_addr, size, mp_p->mp_mmflags, state,
mp_p->mp_fd, mp_p->mp_top);
if (mem == (void *)MAP_FAILED) {
if (errno == ENOMEM) {
@@ -321,7 +325,7 @@ static int free_pages(void *pages, const unsigned long size,
const int sbrk_b)
{
if (! sbrk_b) {
(void)munmap((caddr_t)pages, size);
(void)munmap(pages, size);
}
return MPOOL_ERROR_NONE;
@@ -1124,7 +1128,7 @@ int mpool_close(mpool_t *mp_p)
}
size = SIZE_OF_PAGES(mp_p, PAGES_IN_SIZE(mp_p, sizeof(mpool_t)));
(void)munmap((caddr_t)addr, size);
(void)munmap(addr, size);
}
return final;