diff options
| 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 |
| commit | ea1b2a40def72caa03a40460bf04911b0d9b4d46 (patch) | |
| tree | d4d4e16ea6c718637f6edc0ee6b75cfe514f1667 /media/libstagefright/codecs/common | |
| parent | 2c32a92c84445d312b0dee4c82f84c036f2ca651 (diff) | |
| download | frameworks_av-ea1b2a40def72caa03a40460bf04911b0d9b4d46.zip frameworks_av-ea1b2a40def72caa03a40460bf04911b0d9b4d46.tar.gz frameworks_av-ea1b2a40def72caa03a40460bf04911b0d9b4d46.tar.bz2 | |
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
Diffstat (limited to 'media/libstagefright/codecs/common')
| -rw-r--r-- | media/libstagefright/codecs/common/cmnMemory.c | 4 |
1 files changed, 1 insertions, 3 deletions
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; |