diff options
| author | Hib Eris <hib@hiberis.nl> | 2009-12-20 10:09:54 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2009-12-22 16:16:26 (GMT) |
| commit | e732e45fbf5930d8c3ac2471ff8912f41152ec7a (patch) | |
| tree | d014d40e8b8b3f09a3f18421c8dae1a9436e1518 | |
| parent | b35d0e8093d0a9e3499091b028e8c7ff101c0af1 (diff) | |
[windows] Make comics backend also compile on Windows
See bgo#605146.
| -rw-r--r-- | backend/comics/comics-document.c | 8 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 9 insertions, 11 deletions
diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c index c2c625a..b82569b 100644 --- a/backend/comics/comics-document.c +++ b/backend/comics/comics-document.c @@ -22,7 +22,6 @@ #include <unistd.h> #include <string.h> -#include <sys/wait.h> #include <stdlib.h> #include <errno.h> @@ -31,6 +30,13 @@ #include <glib/gstdio.h> #include <gio/gio.h> +#ifdef G_OS_WIN32 +# define WIFEXITED(x) ((x) != 3) +# define WEXITSTATUS(x) (x) +#else +# include <sys/wait.h> +#endif + #include "comics-document.h" #include "ev-document-misc.h" #include "ev-document-thumbnails.h" diff --git a/configure.ac b/configure.ac index 84432ff..750f9a5 100644 --- a/configure.ac +++ b/configure.ac @@ -666,16 +666,8 @@ AC_ARG_ENABLE(comics, [enable_comics=yes]) if test "x$enable_comics" = "xyes"; then - if test "x$os_win32" = "xyes"; then - # The comics backend is disabled on windows because: - # 1) it uses unix functions from sys/wait.h. - # 2) it uses external decompression tools not generally available on windows. - enable_comics=no - AC_MSG_WARN(The comics backend is not supported on windows.) - else - AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.]) - fi -fi + AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.]) +fi AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes) dnl ================== End of comic book checks ============================================ |