summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2010-06-13 20:01:47 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-13 20:01:47 -0700
commit34b418cddbd2f05d5c0a98c550c65e457015134e (patch)
tree79fde96afb0f2d22b73015576c5ba850e8d5979e
parent9e660c8201ab9aeead5d78a75c2bbfecc374858f (diff)
parent5e95930bd87b98b01ffe48075fa13c234c2ed08f (diff)
am 5e95930b: am 43a9527c: Fix include paths.
Merge commit '5e95930bd87b98b01ffe48075fa13c234c2ed08f' into gingerbread-plus-aosp * commit '5e95930bd87b98b01ffe48075fa13c234c2ed08f': Fix include paths.
-rw-r--r--include/utils/PollLoop.h2
-rw-r--r--libs/ui/InputDispatcher.cpp2
-rw-r--r--libs/ui/InputReader.cpp1
3 files changed, 1 insertions, 4 deletions
diff --git a/include/utils/PollLoop.h b/include/utils/PollLoop.h
index 2ec39fe50008..c9d951f18a83 100644
--- a/include/utils/PollLoop.h
+++ b/include/utils/PollLoop.h
@@ -20,7 +20,7 @@
#include <utils/Vector.h>
#include <utils/threads.h>
-#include <poll.h>
+#include <sys/poll.h>
namespace android {
diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp
index 8e907daa7a01..0ccde0d31252 100644
--- a/libs/ui/InputDispatcher.cpp
+++ b/libs/ui/InputDispatcher.cpp
@@ -27,10 +27,8 @@
#include <stddef.h>
#include <unistd.h>
-#include <fcntl.h>
#include <errno.h>
#include <limits.h>
-#include <poll.h>
namespace android {
diff --git a/libs/ui/InputReader.cpp b/libs/ui/InputReader.cpp
index 76f9ec978ef2..796abd0f7a0a 100644
--- a/libs/ui/InputReader.cpp
+++ b/libs/ui/InputReader.cpp
@@ -24,7 +24,6 @@
#include <stddef.h>
#include <unistd.h>
-#include <fcntl.h>
#include <errno.h>
#include <limits.h>