diff options
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index 5144c5d6c92..de1b07a81cc 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -119,6 +119,10 @@ static struct rlimit nofile_limit; | |||
| 119 | #include "gnutls.h" | 119 | #include "gnutls.h" |
| 120 | #endif | 120 | #endif |
| 121 | 121 | ||
| 122 | #ifdef HAVE_ANDROID | ||
| 123 | #include "android.h" | ||
| 124 | #endif | ||
| 125 | |||
| 122 | #ifdef HAVE_WINDOW_SYSTEM | 126 | #ifdef HAVE_WINDOW_SYSTEM |
| 123 | #include TERM_HEADER | 127 | #include TERM_HEADER |
| 124 | #endif /* HAVE_WINDOW_SYSTEM */ | 128 | #endif /* HAVE_WINDOW_SYSTEM */ |
| @@ -5679,7 +5683,17 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 5679 | timeout = short_timeout; | 5683 | timeout = short_timeout; |
| 5680 | #endif | 5684 | #endif |
| 5681 | 5685 | ||
| 5682 | /* Non-macOS HAVE_GLIB builds call thread_select in xgselect.c. */ | 5686 | /* Android doesn't support threads and requires using a |
| 5687 | replacement for pselect in android.c to poll for | ||
| 5688 | events. */ | ||
| 5689 | #if defined HAVE_ANDROID && !defined ANDROID_STUBIFY | ||
| 5690 | nfds = android_select (max_desc + 1, | ||
| 5691 | &Available, (check_write ? &Writeok : 0), | ||
| 5692 | NULL, &timeout, NULL); | ||
| 5693 | #else | ||
| 5694 | |||
| 5695 | /* Non-macOS HAVE_GLIB builds call thread_select in | ||
| 5696 | xgselect.c. */ | ||
| 5683 | #if defined HAVE_GLIB && !defined HAVE_NS | 5697 | #if defined HAVE_GLIB && !defined HAVE_NS |
| 5684 | nfds = xg_select (max_desc + 1, | 5698 | nfds = xg_select (max_desc + 1, |
| 5685 | &Available, (check_write ? &Writeok : 0), | 5699 | &Available, (check_write ? &Writeok : 0), |
| @@ -5695,6 +5709,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 5695 | (check_write ? &Writeok : 0), | 5709 | (check_write ? &Writeok : 0), |
| 5696 | NULL, &timeout, NULL); | 5710 | NULL, &timeout, NULL); |
| 5697 | #endif /* !HAVE_GLIB */ | 5711 | #endif /* !HAVE_GLIB */ |
| 5712 | #endif /* HAVE_ANDROID && !ANDROID_STUBIFY */ | ||
| 5698 | 5713 | ||
| 5699 | #ifdef HAVE_GNUTLS | 5714 | #ifdef HAVE_GNUTLS |
| 5700 | /* Merge tls_available into Available. */ | 5715 | /* Merge tls_available into Available. */ |