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:
authorCampbell Barton <ideasman42@gmail.com>2011-12-07 08:27:40 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-12-07 08:27:40 +0400
commit2a35e8f9c140d082c6292efcf5b05f52aee6c95e (patch)
treee38d5fbfa201b96c36ba7383d446ae743cc0d108 /source/blender/blenlib/intern
parent4b0b3f578c9c686b787c6e86f9d7bae42728fd70 (diff)
remove BMEMSET define, use memset instead
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r--source/blender/blenlib/intern/BLI_cellalloc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenlib/intern/BLI_cellalloc.c b/source/blender/blenlib/intern/BLI_cellalloc.c
index 51a244b4bce..ff77dc444af 100644
--- a/source/blender/blenlib/intern/BLI_cellalloc.c
+++ b/source/blender/blenlib/intern/BLI_cellalloc.c
@@ -69,7 +69,7 @@ typedef struct MemHeader {
//#define USE_GUARDEDALLOC
-void *BLI_cellalloc_malloc(long size, const char *tag)
+void *BLI_cellalloc_malloc(int size, const char *tag)
{
MemHeader *memh;
int slot = size + sizeof(MemHeader);
@@ -112,11 +112,10 @@ void *BLI_cellalloc_malloc(long size, const char *tag)
return memh + 1;
}
-void *BLI_cellalloc_calloc(long size, const char *tag)
+void *BLI_cellalloc_calloc(int size, const char *tag)
{
void *mem = BLI_cellalloc_malloc(size, tag);
- BMEMSET(mem, 0, size);
-
+ memset(mem, 0, size);
return mem;
}