diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-06-13 19:59:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-13 19:59:26 -0700 |
| commit | fc4ee95f30247599ccb3fa90273999f3c9651014 (patch) | |
| tree | 1cc6d2fd13db105de46384a8a33eac2c0309caaf | |
| parent | 39a128a857e70ffeeb068e96b88c50c153e22979 (diff) | |
| parent | 66d9df50dac51940156f121768aaeb9a25ef2179 (diff) | |
| download | frameworks_native-fc4ee95f30247599ccb3fa90273999f3c9651014.zip frameworks_native-fc4ee95f30247599ccb3fa90273999f3c9651014.tar.gz frameworks_native-fc4ee95f30247599ccb3fa90273999f3c9651014.tar.bz2 | |
am 43a9527c: Fix include paths.
Merge commit '43a9527c54b71cb17515591af37eeeef6c22e3ff' into gingerbread
* commit '43a9527c54b71cb17515591af37eeeef6c22e3ff':
Fix include paths.
| -rw-r--r-- | include/utils/PollLoop.h | 2 | ||||
| -rw-r--r-- | libs/ui/InputDispatcher.cpp | 2 | ||||
| -rw-r--r-- | libs/ui/InputReader.cpp | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/include/utils/PollLoop.h b/include/utils/PollLoop.h index 2ec39fe..c9d951f 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 8e907da..0ccde0d 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 76f9ec9..796abd0 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> |