Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge

Conflicts:
	include/platform.h
	libbb/Kbuild.src
	libbb/messages.c

2 files changed, 3 insertions, 3 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 0f89443e0..85447cbfe 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -317,8 +317,8 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "FILE"
 //usage:#define bzcat_full_usage "\n\n"
 //usage:       "Decompress to stdout"
-//applet:IF_BUNZIP2(APPLET(bunzip2, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-//applet:IF_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, _BB_DIR_USR_BIN, _BB_SUID_DROP, bzcat))
+//applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat))
 #if ENABLE_BUNZIP2
 static
 IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(unpack_info_t *info UNUSED_PARAM)
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index 78b0ae25f..2e0332792 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -199,7 +199,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
                 uint16_t magic2;
 
  autodetect:
-                magic2 = *(uint16_t*)tar.name;
+                magic2 = *(bb__aliased_uint16_t*)tar.name;
                 /* tar gz/bz autodetect: check for gz/bz2 magic.
                  * If we see the magic, and it is the very first block,
                  * we can switch to get_header_tar_gz/bz2/lzma().