On Windows, do not define and use WIFSIGNALED because condition of

WIFSIGNALED was always false and bcc complained.

SVN-Revision: 1742

diff --git a/libarchive/archive_read_support_compression_program.c b/libarchive/archive_read_support_compression_program.c
index 11ee8054977a8dff3e58ac9936f9f36a5665bcda..f9b2cc6117213c1d39d0e94172fab33f2cb0794e 100644 (file)
--- a/libarchive/archive_read_support_compression_program.c
+++ b/libarchive/archive_read_support_compression_program.c
@@ -251,6 +251,7 @@ child_stop(struct archive_read_filter *self, struct program_filter *state)
                return (ARCHIVE_WARN);
        }
 
+#if !defined(_WIN32) || defined(__CYGWIN__)
        if (WIFSIGNALED(state->exit_status)) {
 #ifdef SIGPIPE
                /* If the child died because we stopped reading before
@@ -267,6 +268,7 @@ child_stop(struct archive_read_filter *self, struct program_filter *state)
                    WTERMSIG(state->exit_status));
                return (ARCHIVE_WARN);
        }
+#endif /* !_WIN32 || __CYGWIN__ */
 
        if (WIFEXITED(state->exit_status)) {
                if (WEXITSTATUS(state->exit_status) == 0)

diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
index a401374c4f8efa7373a6466810224e41ec72f687..acb48d91d086345db2c3877047ff56b9b9a088ca 100644 (file)
--- a/libarchive/archive_windows.h
+++ b/libarchive/archive_windows.h
@@ -378,8 +378,6 @@ extern ssize_t       __la_write(int fd, const void *buf, size_t nbytes);
 #define _stat64i32(path, st)   __la_stat(path, st)
 #define _stat64(path, st)      __la_stat(path, st)
 /* for status returned by la_waitpid */
-#define WIFSIGNALED(sts)       0
-#define WTERMSIG(sts)          0
 #define WIFEXITED(sts)         ((sts & 0x100) == 0)
 #define WEXITSTATUS(sts)       (sts & 0x0FF)