diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-06 23:53:32 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-06 23:53:32 +0400 |
| commit | 270184e1b2e98a00d9e7f5598084fe65943bf925 (patch) | |
| tree | 1dafc3678a12ee187e4ab0a5e94efc7690213e0b /intern | |
| parent | eda7cdc81dde901f0fbfee6e9c0b04031b212e69 (diff) | |
| parent | a06a4663c4df9094acf5ab01e7407f379b137b51 (diff) | |
soc-2008-mxcurioni: merge-repair with trunk rev 15456
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 9 | ||||
| -rw-r--r-- | intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj | 10 |
2 files changed, 16 insertions, 3 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index f95d9aa418a..25f2fd8d269 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -38,7 +38,10 @@ #include <stdarg.h> /* mmap exception */ -#if defined(AMIGA) || defined(__BeOS) || defined(WIN32) +#if defined(AMIGA) || defined(__BeOS) +#elif defined(WIN32) +#include <sys/types.h> +#include "mmap_win.h" #else #include <sys/types.h> #include <sys/mman.h> @@ -289,7 +292,7 @@ void *MEM_callocN(unsigned int len, const char *str) /* note; mmap returns zero'd memory */ void *MEM_mapallocN(unsigned int len, const char *str) { -#if defined(AMIGA) || defined(__BeOS) || defined(WIN32) +#if defined(AMIGA) || defined(__BeOS) return MEM_callocN(len, str); #else MemHead *memh; @@ -586,7 +589,7 @@ static void rem_memblock(MemHead *memh) totblock--; mem_in_use -= memh->len; -#if defined(AMIGA) || defined(__BeOS) || defined(WIN32) +#if defined(AMIGA) || defined(__BeOS) free(memh); #else diff --git a/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj b/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj index cb3490716fa..40e88511d5d 100644 --- a/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj +++ b/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj @@ -251,6 +251,9 @@ ECHO Done <File RelativePath="..\..\intern\mallocn.c"> </File> + <File + RelativePath="..\..\intern\mmap_win.c"> + </File> </Filter> <Filter Name="Header Files" @@ -261,6 +264,13 @@ ECHO Done <File RelativePath="..\..\MEM_guardedalloc.h"> </File> + <File + RelativePath="..\..\mmap_win.h"> + </File> + </Filter> + <Filter + Name="intern" + Filter=""> </Filter> </Filter> </Files> |