aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports
diff options
context:
space:
mode:
authorGravatar lsalzman <lsalzman@mozilla.com>2015-11-23 10:30:14 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-23 10:30:14 -0800
commitb8b479b29d24f45a25dca74752ff6ed653e60ba9 (patch)
tree307a00b7863c27bdd46eefdaa84c6bd839dd26e3 /src/ports
parentdfd7d48ced44026aafca71ecb5f0138af8125b94 (diff)
use malloc/calloc/free instead of moz_malloc/moz_calloc/moz_free in ports/SkMemory_mozalloc.cpp
Diffstat (limited to 'src/ports')
-rw-r--r--src/ports/SkMemory_mozalloc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ports/SkMemory_mozalloc.cpp b/src/ports/SkMemory_mozalloc.cpp
index 4ca9312671..f070085893 100644
--- a/src/ports/SkMemory_mozalloc.cpp
+++ b/src/ports/SkMemory_mozalloc.cpp
@@ -31,15 +31,15 @@ void* sk_realloc_throw(void* addr, size_t size) {
}
void sk_free(void* p) {
- moz_free(p);
+ free(p);
}
void* sk_malloc_flags(size_t size, unsigned flags) {
- return (flags & SK_MALLOC_THROW) ? moz_xmalloc(size) : moz_malloc(size);
+ return (flags & SK_MALLOC_THROW) ? moz_xmalloc(size) : malloc(size);
}
void* sk_calloc(size_t size) {
- return moz_calloc(size, 1);
+ return calloc(size, 1);
}
void* sk_calloc_throw(size_t size) {