diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-21 21:48:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-21 21:48:28 +0000 |
| commit | dfa3366e83008c2c3853c8d16481f68d435b53fb (patch) | |
| tree | 834082ea4b964b4c74499691709b62ef4b063dba | |
| parent | 481bd07f277a365b6dca003127c8278ae351a445 (diff) | |
| parent | 1700c4f306e3fbace7ee482004bdc0378601a8ea (diff) | |
| download | android_device_generic_goldfish-dfa3366e83008c2c3853c8d16481f68d435b53fb.tar.gz android_device_generic_goldfish-dfa3366e83008c2c3853c8d16481f68d435b53fb.tar.bz2 android_device_generic_goldfish-dfa3366e83008c2c3853c8d16481f68d435b53fb.zip | |
am 1700c4f3: am 33ae28bf: Merge "Fix implicit function declarations in goldfish."
* commit '1700c4f306e3fbace7ee482004bdc0378601a8ea':
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> |