summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--src/ChangeLog5
-rw-r--r--src/alloc.c2
4 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b0f6ab6e984..3e662edb6bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-09-14 Paul Eggert <eggert@cs.ucla.edu>
+ * configure.ac (--without-sync-input): Fix typo in usage message.
+
* configure.ac: Port to hosts lacking gtk.
(PKG_CHECK_MODULES): Capture pkg-config diagnostics
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],
OPTION_DEFAULT_ON([sound],[don't compile with sound support])
-OPTION_DEFAULT_ON([sync-input],[process async input synchronously])
+OPTION_DEFAULT_ON([sync-input],[don't process async input synchronously])
if test "$with_sync_input" = yes; then
AC_DEFINE(SYNC_INPUT, 1, [Process async input synchronously.])
fi
diff --git a/src/ChangeLog b/src/ChangeLog
index 27698886079..b1b4dc8bbcd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-14 Paul Eggert <eggert@cs.ucla.edu>
+
+ * alloc.c [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]:
+ Include "syssignal.h", for 'main_thread'.
+
2012-09-14 Dmitry Antipov <dmantipov@yandex.ru>
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 *);
#if ! defined SYSTEM_MALLOC && ! defined SYNC_INPUT
#ifdef HAVE_PTHREAD
+# include "syssignal.h"
+
/* When GTK uses the file chooser dialog, different backends can be loaded
dynamically. One such a backend is the Gnome VFS backend that gets loaded
if you run Gnome. That backend creates several threads and also allocates