diff options
| author | Karoly Lorentey | 2004-07-22 22:01:29 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-07-22 22:01:29 +0000 |
| commit | 407e382d35ede779a23b974d7ac40a7d3d0fa5ff (patch) | |
| tree | 4a9e97dd58011b0ce2d6223626554765860fd6db /src/keyboard.c | |
| parent | 31d7e9bc5a474c2da8c40f4812ea3e09cd5fb82c (diff) | |
| parent | bb6a9650da7971581f2ddf625c172b58a6806e7a (diff) | |
| download | emacs-407e382d35ede779a23b974d7ac40a7d3d0fa5ff.tar.gz emacs-407e382d35ede779a23b974d7ac40a7d3d0fa5ff.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-461
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-462
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-463
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-220
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 40a545180fe..4d18435e17d 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -595,7 +595,7 @@ int interrupts_deferred; | |||
| 595 | 595 | ||
| 596 | /* We are unable to use interrupts if FIONREAD is not available, | 596 | /* We are unable to use interrupts if FIONREAD is not available, |
| 597 | so flush SIGIO so we won't try. */ | 597 | so flush SIGIO so we won't try. */ |
| 598 | #ifndef FIONREAD | 598 | #if !defined (FIONREAD) || defined(HAVE_CARBON) |
| 599 | #ifdef SIGIO | 599 | #ifdef SIGIO |
| 600 | #undef SIGIO | 600 | #undef SIGIO |
| 601 | #endif | 601 | #endif |