* 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.

7 files changed, 15 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 8b2713a703d..721ab3193b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * configure.ac (POLL_FOR_INPUT): Define with HAVE_WINDOW_SYSTEM.
+
 2014-06-05  Paul Eggert  <eggert@cs.ucla.edu>
 
         * configure.ac: --without-all now implies --without-xft, --disable-acl.
diff --git a/configure.ac b/configure.ac
index fbfedb02795..f5485942bd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4847,6 +4847,7 @@ AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
 ## Common for all window systems
 if test "$window_system" != "none"; then
   AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.])
+  AC_DEFINE(POLL_FOR_INPUT, 1, [Define if you poll periodically to detect C-g.])
   WINDOW_SYSTEM_OBJ="fontset.o fringe.o image.o"
 fi
 
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 3c614b8ebec..cbbb5814762 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * inc/ms-w32.h (POLL_FOR_INPUT): Define with HAVE_WINDOW_SYSTEM.
+
 2014-05-29  Eli Zaretskii  <eliz@gnu.org>
 
         * Makefile.in (DONT_INSTALL): Now empty.
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 1cf78bac83a..edb143c68d4 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -159,6 +159,7 @@ extern char *getenv ();
 #ifdef HAVE_NTGUI
 # ifndef HAVE_WINDOW_SYSTEM
 #  define HAVE_WINDOW_SYSTEM 1
+#  define POLL_FOR_INPUT 1
 # endif
 #endif
 
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);