diff options
| author | Elliott Hughes <enh@google.com> | 2015-01-29 05:21:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 05:21:41 +0000 |
| commit | 588f725985ef0757dcf3e1257471b9c91dd4f106 (patch) | |
| tree | 19c4bf0b3e456579c83ff73a9772a28a9fc46021 /modules | |
| parent | fb823c7f6e34973fbfbee788b2ed658dc4544742 (diff) | |
| parent | f4530d6eed5fa432fe9283355a265a38aea58bc6 (diff) | |
| download | hardware_libhardware-588f725985ef0757dcf3e1257471b9c91dd4f106.zip hardware_libhardware-588f725985ef0757dcf3e1257471b9c91dd4f106.tar.gz hardware_libhardware-588f725985ef0757dcf3e1257471b9c91dd4f106.tar.bz2 | |
am f4530d6e: Merge "Add missing includes."
* commit 'f4530d6eed5fa432fe9283355a265a38aea58bc6':
Add missing includes.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/hwcomposer/hwcomposer.cpp | 3 | ||||
| -rw-r--r-- | modules/tv_input/tv_input.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
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> 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> |