talons

commit 5baba3b17f86def8aeec177838cb4a24b9d552a8
parent 2576eed4b572d994fe1c99a61c083e0df51ea20a
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 14 Dec 2010 21:03:24 +0000

2010-12-14 [colin]	3.7.8cvs2

	* src/gtk/gtkaspell.c
		Add missing guard for sys/wait.h

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/gtkaspell.c
 | 
4
+++-

4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-14 [colin]	3.7.8cvs2
+
+	* src/gtk/gtkaspell.c
+		Add missing guard for sys/wait.h
+
 2010-12-05 [colin]	3.7.8cvs1
 
 	* tools/make.themes.project
diff --git a/PATCHSETS b/PATCHSETS
@@ -4075,3 +4075,4 @@
 ( cvs diff -u -r 1.654.2.4146 -r 1.654.2.4147 configure.ac;  cvs diff -u -r -1.1.2.6 -r -1.1.2.7 manual/xml2pdf;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/dist/pdf/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/dist/pdf/Makefile.am;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/fr/dist/pdf/Makefile.am;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/pl/dist/pdf/Makefile.am;  ) > 3.7.7cvs11.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/de/dist/pdf/Makefile.am;  ) > 3.7.7cvs12.patchset
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 tools/make.themes.project;  ) > 3.7.8cvs1.patchset
+( cvs diff -u -r 1.9.2.69 -r 1.9.2.70 src/gtk/gtkaspell.c;  ) > 3.7.8cvs2.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
@@ -33,7 +33,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/wait.h>
+#if HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif
 #include <signal.h>
 #include <ctype.h>
 #include <string.h>