diff options
| author | Paul Eggert | 2012-09-14 15:01:19 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-14 15:01:19 -0700 |
| commit | 2af0342954599918f739d981e8151f7e8a46c3c6 (patch) | |
| tree | 4eadf341a552603165d813608ae8765e794a1fd8 | |
| parent | e3141fcf8456dc1ec7455e34437ac09f0c812ac9 (diff) | |
| download | emacs-2af0342954599918f739d981e8151f7e8a46c3c6.tar.gz emacs-2af0342954599918f739d981e8151f7e8a46c3c6.zip | |
Fix glitches with 'configure --without-sync-input'.
* configure.ac (--without-sync-input): Fix typo in usage message.
* alloc.c [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]:
Include "syssignal.h", for 'main_thread'.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/alloc.c | 2 |
4 files changed, 10 insertions, 1 deletions
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-09-14 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2012-09-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * configure.ac (--without-sync-input): Fix typo in usage message. | ||
| 4 | |||
| 3 | * configure.ac: Port to hosts lacking gtk. | 5 | * configure.ac: Port to hosts lacking gtk. |
| 4 | (PKG_CHECK_MODULES): Capture pkg-config diagnostics | 6 | (PKG_CHECK_MODULES): Capture pkg-config diagnostics |
| 5 | better, in particular, problems in invoking pkg-config itself. | 7 | better, in particular, problems in invoking pkg-config itself. |
diff --git a/configure.ac b/configure.ac index accbb68e7b0..382e62a97a1 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -128,7 +128,7 @@ AC_ARG_WITH([mailhost],[AS_HELP_STRING([--with-mailhost=HOSTNAME], | |||
| 128 | 128 | ||
| 129 | OPTION_DEFAULT_ON([sound],[don't compile with sound support]) | 129 | OPTION_DEFAULT_ON([sound],[don't compile with sound support]) |
| 130 | 130 | ||
| 131 | OPTION_DEFAULT_ON([sync-input],[process async input synchronously]) | 131 | OPTION_DEFAULT_ON([sync-input],[don't process async input synchronously]) |
| 132 | if test "$with_sync_input" = yes; then | 132 | if test "$with_sync_input" = yes; then |
| 133 | AC_DEFINE(SYNC_INPUT, 1, [Process async input synchronously.]) | 133 | AC_DEFINE(SYNC_INPUT, 1, [Process async input synchronously.]) |
| 134 | fi | 134 | fi |
diff --git a/src/ChangeLog b/src/ChangeLog index 27698886079..b1b4dc8bbcd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-09-14 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * alloc.c [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]: | ||
| 4 | Include "syssignal.h", for 'main_thread'. | ||
| 5 | |||
| 1 | 2012-09-14 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2012-09-14 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | Avoid out-of-range marker position (Bug#12426). | 8 | Avoid out-of-range marker position (Bug#12426). |
diff --git a/src/alloc.c b/src/alloc.c index 77807f6e086..25cf03dfa2e 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -100,6 +100,8 @@ extern void _free_internal (void *); | |||
| 100 | #if ! defined SYSTEM_MALLOC && ! defined SYNC_INPUT | 100 | #if ! defined SYSTEM_MALLOC && ! defined SYNC_INPUT |
| 101 | #ifdef HAVE_PTHREAD | 101 | #ifdef HAVE_PTHREAD |
| 102 | 102 | ||
| 103 | # include "syssignal.h" | ||
| 104 | |||
| 103 | /* When GTK uses the file chooser dialog, different backends can be loaded | 105 | /* When GTK uses the file chooser dialog, different backends can be loaded |
| 104 | dynamically. One such a backend is the Gnome VFS backend that gets loaded | 106 | dynamically. One such a backend is the Gnome VFS backend that gets loaded |
| 105 | if you run Gnome. That backend creates several threads and also allocates | 107 | if you run Gnome. That backend creates several threads and also allocates |