diff options
| author | Elliott Hughes <enh@google.com> | 2015-01-29 17:22:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 17:22:55 +0000 |
| commit | da07788db8d8d5a49ded715bf8cbb94b18046274 (patch) | |
| tree | bcbedfa9fc6b2c58117e59ba77cf344bf2c8aa10 /modules | |
| parent | 244cee7b1c72dcf6fc0fd2fc00e458fbd48e050b (diff) | |
| parent | 588f725985ef0757dcf3e1257471b9c91dd4f106 (diff) | |
| download | hardware_libhardware-da07788db8d8d5a49ded715bf8cbb94b18046274.zip hardware_libhardware-da07788db8d8d5a49ded715bf8cbb94b18046274.tar.gz hardware_libhardware-da07788db8d8d5a49ded715bf8cbb94b18046274.tar.bz2 | |
am 588f7259: am f4530d6e: Merge "Add missing includes."
* commit '588f725985ef0757dcf3e1257471b9c91dd4f106':
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> |