aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorJoakim Verona2011-07-17 23:57:23 +0200
committerJoakim Verona2011-07-17 23:57:23 +0200
commitb0ec5b0839c3f2687b4dddc385ae22b72f96db99 (patch)
treed35d3789847cbdd287e9ffec4ea53a0ac63fc988 /src/process.c
parent32b1b66b26662eb2dd46657cbd292063691bfc79 (diff)
parent6265325e6bc5ed7da0e049f1b6e148932ea69e34 (diff)
downloademacs-b0ec5b0839c3f2687b4dddc385ae22b72f96db99.tar.gz
emacs-b0ec5b0839c3f2687b4dddc385ae22b72f96db99.zip
merge upstream
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c
index 1a884357b86..236c27e5c3a 100644
--- a/src/process.c
+++ b/src/process.c
@@ -245,7 +245,7 @@ static void create_pty (Lisp_Object);
245 245
246/* If we support a window system, turn on the code to poll periodically 246/* If we support a window system, turn on the code to poll periodically
247 to detect C-g. It isn't actually used when doing interrupt input. */ 247 to detect C-g. It isn't actually used when doing interrupt input. */
248#ifdef HAVE_WINDOW_SYSTEM 248#if defined(HAVE_WINDOW_SYSTEM) && !defined(USE_ASYNC_EVENTS)
249#define POLL_FOR_INPUT 249#define POLL_FOR_INPUT
250#endif 250#endif
251 251