* configure.ac (POLL_FOR_INPUT): Define with HAVE_WINDOW_SYSTEM.

* nt/inc/ms-w32.h (POLL_FOR_INPUT): Likewise.
* src/keyboard.c, src/process.c: Do not define POLL_FOR_INPUT here
because it will be defined in generated config.h if needed.

3 files changed, 5 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8cbd4c54e33..2a149a07214 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * keyboard.c, process.c: Do not define POLL_FOR_INPUT here
+        because it will be defined in generated config.h if needed.
+
 2014-06-04  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Use terminal-specific hooks to display popup dialogs.
diff --git a/src/keyboard.c b/src/keyboard.c
index 17bfc81b82f..80b1f521310 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -377,12 +377,6 @@ bool interrupt_input;
 /* Nonzero while interrupts are temporarily deferred during redisplay.  */
 bool interrupts_deferred;
 
-/* If we support a window system, turn on the code to poll periodically
-   to detect C-g.  It isn't actually used when doing interrupt input.  */
-#ifdef HAVE_WINDOW_SYSTEM
-#define POLL_FOR_INPUT
-#endif
-
 /* The time when Emacs started being idle.  */
 
 static struct timespec timer_idleness_start_time;
diff --git a/src/process.c b/src/process.c
index 9321cdc4875..7f9b5ac59d1 100644
--- a/src/process.c
+++ b/src/process.c
@@ -286,12 +286,6 @@ static int read_process_output (Lisp_Object, int);
 static void handle_child_signal (int);
 static void create_pty (Lisp_Object);
 
-/* If we support a window system, turn on the code to poll periodically
-   to detect C-g.  It isn't actually used when doing interrupt input.  */
-#ifdef HAVE_WINDOW_SYSTEM
-#define POLL_FOR_INPUT
-#endif
-
 static Lisp_Object get_process (register Lisp_Object name);
 static void exec_sentinel (Lisp_Object proc, Lisp_Object reason);