summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-21 21:55:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-21 21:55:20 +0000
commit0e2c081f54574b1fa3c24e38538840f97b3d8d56 (patch)
tree7f99b2200562125deaa3e0f1e27a85fa699b874d
parentea1acdae6548e2afe1ceb74b6c177b22ad0d25c4 (diff)
parentdfa3366e83008c2c3853c8d16481f68d435b53fb (diff)
downloadandroid_device_generic_goldfish-0e2c081f54574b1fa3c24e38538840f97b3d8d56.tar.gz
android_device_generic_goldfish-0e2c081f54574b1fa3c24e38538840f97b3d8d56.tar.bz2
android_device_generic_goldfish-0e2c081f54574b1fa3c24e38538840f97b3d8d56.zip
am dfa3366e: am 1700c4f3: am 33ae28bf: Merge "Fix implicit function declarations in goldfish."
* commit 'dfa3366e83008c2c3853c8d16481f68d435b53fb': Fix implicit function declarations in goldfish.
-rw-r--r--qemud/qemud.c1
-rw-r--r--vibrator/vibrator_qemu.c1
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>