2 files changed, 4 insertions, 3 deletions

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.
  */