svn commit: r201112 - head/lib/libarchive

[Tim Kientzle]

Author: kientzle
Date: Mon Dec 28 06:59:35 2009
New Revision: 201112
URL: http://svn.freebsd.org/changeset/base/201112

Log:
  Portability.

Modified:
  head/lib/libarchive/archive_read_support_compression_program.c

Modified: head/lib/libarchive/archive_read_support_compression_program.c
==============================================================================
--- head/lib/libarchive/archive_read_support_compression_program.c	Mon Dec 28 03:33:05 2009	(r201111)
+++ head/lib/libarchive/archive_read_support_compression_program.c	Mon Dec 28 06:59:35 2009	(r201112)
@@ -205,7 +205,7 @@ program_bidder_bid(struct archive_read_f
 		/* No match, so don't bid. */
 		if (memcmp(p, state->signature, state->signature_len) != 0)
 			return (0);
-		return (state->signature_len * 8);
+		return ((int)state->signature_len * 8);
 	}
 
 	/* Otherwise, bid once and then never bid again. */
@@ -251,6 +251,7 @@ child_stop(struct archive_read_filter *s
 		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 *s
 		    WTERMSIG(state->exit_status));
 		return (ARCHIVE_WARN);
 	}
+#endif /* !_WIN32 || __CYGWIN__ */
 
 	if (WIFEXITED(state->exit_status)) {
 		if (WEXITSTATUS(state->exit_status) == 0)