diff options
| author | Dmitry Antipov | 2014-06-05 10:24:54 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2014-06-05 10:24:54 +0400 |
| commit | ea633fff4c8e2e4a2b7f6117ba0a9d5a2685aecd (patch) | |
| tree | d055b3ab685fea0ab59223f9dfcedd858576eccd /nt | |
| parent | 0d46b5f12c2e87c1fb2d5f103f2012c2f03a7ba9 (diff) | |
| download | emacs-ea633fff4c8e2e4a2b7f6117ba0a9d5a2685aecd.tar.gz emacs-ea633fff4c8e2e4a2b7f6117ba0a9d5a2685aecd.zip | |
* 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.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/inc/ms-w32.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 3c614b8ebec..cbbb5814762 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-06-05 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * inc/ms-w32.h (POLL_FOR_INPUT): Define with HAVE_WINDOW_SYSTEM. | ||
| 4 | |||
| 1 | 2014-05-29 Eli Zaretskii <eliz@gnu.org> | 5 | 2014-05-29 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * Makefile.in (DONT_INSTALL): Now empty. | 7 | * 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 (); | |||
| 159 | #ifdef HAVE_NTGUI | 159 | #ifdef HAVE_NTGUI |
| 160 | # ifndef HAVE_WINDOW_SYSTEM | 160 | # ifndef HAVE_WINDOW_SYSTEM |
| 161 | # define HAVE_WINDOW_SYSTEM 1 | 161 | # define HAVE_WINDOW_SYSTEM 1 |
| 162 | # define POLL_FOR_INPUT 1 | ||
| 162 | # endif | 163 | # endif |
| 163 | #endif | 164 | #endif |
| 164 | 165 | ||