From e07bf014e25c1646ff29e8b1813fbe87dab861a2 Mon Sep 17 00:00:00 2001
From: ChenHengming <ChenHengming@6e48237b-75ef-9749-8fc9-41990f28c85a>
Date: Thu, 13 Aug 2015 09:22:51 +0000
Subject: [PATCH] [osal]: rename os_malloc.h to os_mem.h

git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@99 6e48237b-75ef-9749-8fc9-41990f28c85a
---
 osal/android/os_mem.c          | 2 +-
 osal/linux/os_mem.c            | 2 +-
 osal/mpp_mem.cpp               | 2 +-
 osal/{os_malloc.h => os_mem.h} | 0
 osal/window/os_mem.c           | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename osal/{os_malloc.h => os_mem.h} (100%)

diff --git a/osal/android/os_mem.c b/osal/android/os_mem.c
index bd747acd..03daf1b5 100644
--- a/osal/android/os_mem.c
+++ b/osal/android/os_mem.c
@@ -15,7 +15,7 @@
  */
 
 #include <stdlib.h>
-#include "os_malloc.h"
+#include "os_mem.h"
 
 int os_malloc(void **memptr, size_t alignment, size_t size)
 {
diff --git a/osal/linux/os_mem.c b/osal/linux/os_mem.c
index 19f648f6..564b67bd 100644
--- a/osal/linux/os_mem.c
+++ b/osal/linux/os_mem.c
@@ -15,7 +15,7 @@
  */
 
 #include <stdlib.h>
-#include "os_malloc.h"
+#include "os_mem.h"
 
 int os_malloc(void **memptr, size_t alignment, size_t size)
 {
diff --git a/osal/mpp_mem.cpp b/osal/mpp_mem.cpp
index 366955b5..41cf348d 100644
--- a/osal/mpp_mem.cpp
+++ b/osal/mpp_mem.cpp
@@ -26,7 +26,7 @@
 #include "mpp_mem.h"
 #include "mpp_list.h"
 
-#include "os_malloc.h"
+#include "os_mem.h"
 
 // export configure for script detection
 #define CONFIG_OSAL_MEM_LIST        "osal_mem_list"
diff --git a/osal/os_malloc.h b/osal/os_mem.h
similarity index 100%
rename from osal/os_malloc.h
rename to osal/os_mem.h
diff --git a/osal/window/os_mem.c b/osal/window/os_mem.c
index 6301f13f..f73e01a1 100644
--- a/osal/window/os_mem.c
+++ b/osal/window/os_mem.c
@@ -15,7 +15,7 @@
  */
 
 #include <malloc.h>
-#include "os_malloc.h"
+#include "os_mem.h"
 
 int os_malloc(void **memptr, size_t alignment, size_t size)
 {