commit da07788db8d8d5a49ded715bf8cbb94b18046274
author Elliott Hughes <enh@google.com> Thu Jan 29 17:22:55 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 29 17:22:55 2015 +0000
tree bcbedfa9fc6b2c58117e59ba77cf344bf2c8aa10
parent 244cee7b1c72dcf6fc0fd2fc00e458fbd48e050b
parent 588f725985ef0757dcf3e1257471b9c91dd4f106

am 588f7259: am f4530d6e: Merge "Add missing includes."

* commit '588f725985ef0757dcf3e1257471b9c91dd4f106':
  Add missing includes.

modules/hwcomposer/hwcomposer.cpp

diff --git a/modules/hwcomposer/hwcomposer.cpp b/modules/hwcomposer/hwcomposer.cpp
index f0a5512..9d1aa34 100644
--- 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>

modules/tv_input/tv_input.cpp

diff --git a/modules/tv_input/tv_input.cpp b/modules/tv_input/tv_input.cpp
index bc02786..114e80e 100644
--- 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>