summaryrefslogtreecommitdiff
path: root/vpx_mem
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2015-04-23 20:47:40 -0700
committerJames Zern <jzern@google.com>2015-04-28 20:00:59 -0700
commitf58011ada5e3d28d9acf078657f8117f0960d240 (patch)
tree70beff98e74f20148d562ec6e94020ca34175ab6 /vpx_mem
parentf274c2199beab8cd656efd0660222b1aa1864ce8 (diff)
downloadlibvpx-f58011ada5e3d28d9acf078657f8117f0960d240.tar
libvpx-f58011ada5e3d28d9acf078657f8117f0960d240.tar.gz
libvpx-f58011ada5e3d28d9acf078657f8117f0960d240.tar.bz2
libvpx-f58011ada5e3d28d9acf078657f8117f0960d240.zip
vpx_mem: remove vpx_memset
vestigial. replace instances with memset() which they already were being defined to. Change-Id: Ie030cfaaa3e890dd92cf1a995fcb1927ba175201
Diffstat (limited to 'vpx_mem')
-rw-r--r--vpx_mem/vpx_mem.c4
-rw-r--r--vpx_mem/vpx_mem.h6
2 files changed, 1 insertions, 9 deletions
diff --git a/vpx_mem/vpx_mem.c b/vpx_mem/vpx_mem.c
index 1513b0fe4..b60d7319c 100644
--- a/vpx_mem/vpx_mem.c
+++ b/vpx_mem/vpx_mem.c
@@ -91,10 +91,6 @@ void vpx_free(void *memblk) {
}
}
-void *vpx_memset(void *dest, int val, size_t length) {
- return memset(dest, val, length);
-}
-
#if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
void *vpx_memset16(void *dest, int val, size_t length) {
int i;
diff --git a/vpx_mem/vpx_mem.h b/vpx_mem/vpx_mem.h
index 37c9bcb23..a027714a0 100644
--- a/vpx_mem/vpx_mem.h
+++ b/vpx_mem/vpx_mem.h
@@ -30,15 +30,11 @@ extern "C" {
void *vpx_realloc(void *memblk, size_t size);
void vpx_free(void *memblk);
- void *vpx_memset(void *dest, int val, size_t length);
#if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
void *vpx_memset16(void *dest, int val, size_t length);
#endif
-#ifndef __VPX_MEM_C__
-# include <string.h>
-# define vpx_memset memset
-#endif
+#include <string.h>
#ifdef VPX_MEM_PLTFRM
# include VPX_MEM_PLTFRM