diff options
author | Elliott Hughes <enh@google.com> | 2015-02-21 21:42:03 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-21 21:42:03 +0000 |
commit | 1700c4f306e3fbace7ee482004bdc0378601a8ea (patch) | |
tree | 834082ea4b964b4c74499691709b62ef4b063dba | |
parent | e1ad40345f9283e9e78eea000a7e87282ab1f81f (diff) | |
parent | 33ae28bf3d7a3ffd00cad80284be2ac33155a7f3 (diff) | |
download | android_device_generic_goldfish-1700c4f306e3fbace7ee482004bdc0378601a8ea.tar.gz android_device_generic_goldfish-1700c4f306e3fbace7ee482004bdc0378601a8ea.tar.bz2 android_device_generic_goldfish-1700c4f306e3fbace7ee482004bdc0378601a8ea.zip |
am 33ae28bf: Merge "Fix implicit function declarations in goldfish."
* commit '33ae28bf3d7a3ffd00cad80284be2ac33155a7f3':
Fix implicit function declarations in goldfish.
-rw-r--r-- | qemud/qemud.c | 1 | ||||
-rw-r--r-- | vibrator/vibrator_qemu.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/qemud/qemud.c b/qemud/qemud.c index 543ce35..3d18893 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -7,6 +7,7 @@ #include <string.h> #include <sys/socket.h> #include <termios.h> +#include <unistd.h> #include <cutils/sockets.h> /* diff --git a/vibrator/vibrator_qemu.c b/vibrator/vibrator_qemu.c index 46c30b4..5e2dc9a 100644 --- a/vibrator/vibrator_qemu.c +++ b/vibrator/vibrator_qemu.c @@ -19,6 +19,7 @@ #include <cutils/log.h> +#define QEMU_HARDWARE #include <qemu.h> #include <hardware/hardware.h> #include <hardware/vibrator.h> |