diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-21 14:39:02 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-21 14:39:02 +0400 |
commit | 9a776daca8fa0aa9bfa22c0c4dd9b6e649acdb84 (patch) | |
tree | c8a7687986c108a138dd6144b87f2701074fbc93 /intern | |
parent | 671e3df070c7868d8a5a445ebab5f819718270c4 (diff) |
code cleanup: vfont's used confusing and over complicated method of storing memory for loaded fonts, not store as a temp var in the fonts.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/guardedalloc/MEM_guardedalloc.h | 2 | ||||
-rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 149483e719f..6973c19dea9 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -92,7 +92,7 @@ extern "C" { /** * Duplicates a block of memory, and returns a pointer to the * newly allocated block. */ - void *MEM_dupallocN(void *vmemh) + void *MEM_dupallocN(const void *vmemh) #if MEM_GNU_ATTRIBUTES __attribute__((warn_unused_result)) #endif diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index df6f4d59c7f..a65871f4410 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -248,12 +248,12 @@ size_t MEM_allocN_len(const void *vmemh) } } -void *MEM_dupallocN(void *vmemh) +void *MEM_dupallocN(const void *vmemh) { void *newp = NULL; if (vmemh) { - MemHead *memh = vmemh; + const MemHead *memh = vmemh; memh--; #ifndef DEBUG_MEMDUPLINAME |