5 files changed, 11 insertions, 3 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 90aac1427..a859ef201 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -177,6 +177,8 @@ int FAST_FUNC bbunpack(char **argv,
                                 /* Delete _source_ file */
                                 del = filename;
                         }
+                        if (ENABLE_PLATFORM_MINGW32)
+                                xclose(STDIN_FILENO);
                         xunlink(del);
  free_name:
                         if (new_name != filename)
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index 1360abef7..dced609e5 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -36,6 +36,9 @@
 #include <setjmp.h>
 #include "libbb.h"
 #include "bb_archive.h"
+#if ENABLE_PLATFORM_MINGW32 && __GNUC__
+#pragma pack(2)
+#endif
 
 typedef struct huft_t {
         unsigned char e;        /* number of extra bits or operation */
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index ab6aa3afc..0a8c657b7 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -68,6 +68,7 @@ ssize_t FAST_FUNC xtransformer_write(transformer_state_t *xstate, const void *bu
         return nwrote;
 }
 
+#if SEAMLESS_COMPRESSION
 void check_errors_in_children(int signo)
 {
         int status;
@@ -155,9 +156,6 @@ void FAST_FUNC fork_transformer(int fd, const char *transform_prog)
         xmove_fd(fd_pipe.rd, fd);
 }
 
-
-#if SEAMLESS_COMPRESSION
-
 /* Used by e.g. rpm which gives us a fd without filename,
  * thus we can't guess the format from filename's extension.
  */
diff --git a/archival/tar.c b/archival/tar.c
index aa03ba990..85551684b 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -549,6 +549,7 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb
                 }
         }
 
+#if !ENABLE_PLATFORM_MINGW32
         /* It is a bad idea to store the archive we are in the process of creating,
          * so check the device and inode to be sure that this particular file isn't
          * the new tarball */
@@ -558,6 +559,7 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb
                 bb_error_msg("%s: file is the archive; skipping", fileName);
                 return TRUE;
         }
+#endif
 
         if (exclude_file(tbInfo->excludeList, header_name))
                 return SKIP;
diff --git a/archival/unzip.c b/archival/unzip.c
index 38a07e212..1ef026a9f 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -44,6 +44,9 @@
 
 #include "libbb.h"
 #include "bb_archive.h"
+#if ENABLE_PLATFORM_MINGW32 && __GNUC__
+#pragma pack(2)
+#endif
 
 enum {
 #if BB_BIG_ENDIAN