diff options
| author | Chris Want <cwant@ualberta.ca> | 2006-02-24 17:37:24 +0300 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2006-02-24 17:37:24 +0300 |
| commit | 5e3163041ab6dfad5d9270c4409072638cd986b1 (patch) | |
| tree | f18ee57e18d4f06138ba0de5366c415ef332cf7b /intern | |
| parent | d5096f48b17efdb3b17510b6579deeb4ab6b357d (diff) | |
I had to disable mmap altogether for Irix.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index bb117756e66..44f7eda5310 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -252,20 +252,15 @@ 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) || defined(WIN32) || defined(__sgi) return MEM_callocN(len, str); #else MemHead *memh; len = (len + 3 ) & ~3; /* allocate in units of 4 */ -#if defined(__sgi) - memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail), - PROT_READ|PROT_WRITE, MAP_SHARED, -1, 0); -#else memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail), PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0); -#endif if(memh!=(MemHead *)-1) { make_memhead_header(memh, len, str); |