Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-01-23 16:41:38 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-01-23 16:41:38 +0400
commita81cf3182f1ea3d3e40a28e0ec41e04cb12b6a7c (patch)
treea8a8b7f2c49e669c1fdc39f5379a7499cda46c3a /intern/guardedalloc
parent898498c8008078b0c5d311b9a0a362b5a0ad23be (diff)
Fix typo in mmap commit from a while ago
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r--intern/guardedalloc/intern/mallocn_guarded_impl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c
index 9aa140d824c..352d18df732 100644
--- a/intern/guardedalloc/intern/mallocn_guarded_impl.c
+++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c
@@ -545,7 +545,7 @@ void *MEM_guarded_mapallocN(size_t len, const char *str)
* allocating > 4 GB on Windows. the only reason mapalloc exists
* is to get around address space limitations in 32 bit OSes. */
if(sizeof(void*) >= 8)
- return MEM_lockfree_callocN(len, str);
+ return MEM_guarded_callocN(len, str);
len = SIZET_ALIGN_4(len);