diff --git a/ChangeLog b/ChangeLog index 4c1c649c3..ee763b875 100644 --- 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 index ab4ca0bdb..4c5ce2111 100644 --- 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 index 6cee86747..5c928ed08 100644 --- 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 index 91195cd8f..53409999b 100644 --- a/src/gtk/gtkaspell.c +++ b/src/gtk/gtkaspell.c @@ -33,7 +33,9 @@ #include #include #include -#include +#if HAVE_SYS_WAIT_H +# include +#endif #include #include #include