am f4530d6e: Merge "Add missing includes."

* commit 'f4530d6eed5fa432fe9283355a265a38aea58bc6': Add missing includes.
2015-01-29 05:21:41 +00:00
parent fb823c7f6e f4530d6eed
commit 588f725985
2 changed files with 4 additions and 2 deletions
--- a/modules/hwcomposer/hwcomposer.cpp
+++ b/modules/hwcomposer/hwcomposer.cpp
@@ -16,8 +16,9 @@

 #include <hardware/hardware.h>

-#include <fcntl.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <malloc.h>

 #include <cutils/log.h>
 #include <cutils/atomic.h>
--- a/modules/tv_input/tv_input.cpp
+++ b/modules/tv_input/tv_input.cpp
@@ -14,8 +14,9 @@
 * limitations under the License.
 */

-#include <fcntl.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <malloc.h>

 #include <cutils/log.h>
 #include <cutils/native_handle.h>