summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Martin Storsjo <martin@martin.st> 2010-12-22 22:01:11 +0100
committer Martin Storsjo <martin@martin.st> 2011-06-22 21:54:06 +0300
commit5c8247f7307f1543127b7d12d5da122b85bc3d87 (patch)
treeb819e987fdf123cc0550f6cb8911f123da29e43e
parentbf5adfa5e558827fbb4771720433887bb3cbaefd (diff)
stagefright: Include stdlib.h for malloc/free
According to ANSI C, malloc/free are provided by stdlib.h. Also, string.h is always available according to ANSI C, and provides the memset function, so there's no need to include it conditionally for linux only. This makes the code buildable on OS X, too. Change-Id: Ie5d1da02158797e7e45dea257cbe3e4996dde4db
-rw-r--r--media/libstagefright/codecs/common/cmnMemory.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/common/cmnMemory.c b/media/libstagefright/codecs/common/cmnMemory.c
index dd7c26d55a5a..aa52bd98f070 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;