diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-27 14:25:54 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-27 14:25:54 -0700 |
| commit | 1edfd382ba69ff96ebd0220b05b134a90b910ea7 (patch) | |
| tree | 90758d57be56f4c9730ee96b80767920772b8971 /libcutils | |
| parent | 67667115c51693ac27338be2aa7004789b15ff81 (diff) | |
| parent | 09555c7a18342390556132f7d050a410d02206ef (diff) | |
| download | system_core-1edfd382ba69ff96ebd0220b05b134a90b910ea7.zip system_core-1edfd382ba69ff96ebd0220b05b134a90b910ea7.tar.gz system_core-1edfd382ba69ff96ebd0220b05b134a90b910ea7.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/Android.mk | 10 | ||||
| -rw-r--r-- | libcutils/abort_socket.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index aaee8bf..087d652 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -17,7 +17,6 @@ LOCAL_PATH := $(my-dir) include $(CLEAR_VARS) commonSources := \ - abort_socket.c \ array.c \ hashmap.c \ atomic.c \ @@ -45,22 +44,23 @@ commonHostSources := \ # some files must not be compiled when building against Mingw # they correspond to features not used by our host development tools # which are also hard or even impossible to port to native Win32 -WITH_MINGW := +WINDOWS_HOST_ONLY := ifeq ($(HOST_OS),windows) ifeq ($(strip $(USE_CYGWIN)),) - WITH_MINGW := 1 + WINDOWS_HOST_ONLY := 1 endif endif # USE_MINGW is defined when we build against Mingw on Linux ifneq ($(strip $(USE_MINGW)),) - WITH_MINGW := 1 + WINDOWS_HOST_ONLY := 1 endif -ifeq ($(WITH_MINGW),1) +ifeq ($(WINDOWS_HOST_ONLY),1) commonSources += \ uio.c else commonSources += \ + abort_socket.c \ mspace.c \ selector.c \ tztime.c \ diff --git a/libcutils/abort_socket.c b/libcutils/abort_socket.c index d732142..6a5e5e4 100644 --- a/libcutils/abort_socket.c +++ b/libcutils/abort_socket.c @@ -239,7 +239,7 @@ int asocket_write(struct asocket *s, const void *buf, size_t count, } if (pfd[0].revents) { - if (pfd[0].revents & POLLIN) { + if (pfd[0].revents & POLLOUT) { /* ready to write() without blocking */ do { ret = write(s->fd, buf, count); |