commit 6f1dd23b28752fdf47795c6575c537943711b1c1
author Deckard Autoverifier <deckard@android.com> Mon Jul 18 15:38:30 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 18 15:38:30 2011 -0700
tree 93875203ca253310783cf450acd6d9aa1ab445f5
parent 4a028164ee8ce74a7872ce4bcce196b70d9eb4e2
parent a77079f09897f27e97b073d3835fb4b62949a159

am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"

* commit '88409911aebed6c3663e51d51fca67f527c0c2fb':
  stagefright: Include stdlib.h for malloc/free

media/libstagefright/codecs/common/cmnMemory.c

diff --git a/media/libstagefright/codecs/common/cmnMemory.c b/media/libstagefright/codecs/common/cmnMemory.c
index dd7c26d..aa52bd9 100644
--- a/media/libstagefright/codecs/common/cmnMemory.c
+++ b/media/libstagefright/codecs/common/cmnMemory.c
@@ -21,10 +21,8 @@
 *******************************************************************************/
 #include "cmnMemory.h"
 
-#include <malloc.h>
-#if defined LINUX
+#include <stdlib.h>
 #include <string.h>
-#endif
 
 //VO_MEM_OPERATOR		g_memOP;