[windows] Make comics backend also compile on Windows

See bgo#605146.

diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
index c2c625a19942ea9443a8a958f160ec4c048c284e..b82569bb39b04d1689f630a42112a71af7bbb355 100644 (file)
--- 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 84432ff1768193e836ca4efffa49741ed12290fa..750f9a5f65827647c7538618e1193714f9c7d0c2 100644 (file)
--- 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 ============================================