diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2005-05-23 14:41:16 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2005-05-23 14:41:16 +0000 |
| commit | 3acf90f67e8f94ec501af9973f05721e492e433b (patch) | |
| tree | 3e972002161c7a2c15b3b545e8c5dd350cea6329 | |
| parent | 8a24c5a5ee55ddec6896540de2e042abe009ed1e (diff) | |
| download | zsh-3acf90f67e8f94ec501af9973f05721e492e433b.tar.gz zsh-3acf90f67e8f94ec501af9973f05721e492e433b.tar.xz zsh-3acf90f67e8f94ec501af9973f05721e492e433b.zip | |
21270: don't use poll() on Apple
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Src/system.h | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index e49570469..4e77dc510 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-05-23 Peter Stephenson <pws@csr.com> + * 21270: Src/system.h: don't use poll() on Apple. + * users/8863: Doc/Zsh/contrib.yo, Functions/Zle/which-command: enhanced which-command that traces the final command better. diff --git a/Src/system.h b/Src/system.h index 7fc4a7e65..a57e67fb6 100644 --- a/Src/system.h +++ b/Src/system.h @@ -300,6 +300,15 @@ struct timezone { # include <sys/socket.h> #endif +#if defined(__APPLE__) && defined(HAVE_SELECT) +/* + * Prefer select() to poll() on MacOS X since poll() is known + * to be problematic in 10.4 + */ +#undef HAVE_POLL +#undef HAVE_POLL_H +#endif + #ifdef HAVE_SYS_FILIO_H # include <sys/filio.h> #endif |