commit 0ab6faaca562abcb1d116824198388f5a3c8c73d
author Deckard Autoverifier <deckard@android.com> Mon Jul 18 15:44:03 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 18 15:44:03 2011 -0700
tree 771d0d65e2a197c41cd756d3e657b3dedd58f2ae
parent 9f8f2f857b5791b10f5da9b5cc04d3d8f7988c29
parent 6f1dd23b28752fdf47795c6575c537943711b1c1

am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"

* commit '2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
  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;