From ee19476f952aeee770e7846e8206490ce26f7ded Mon Sep 17 00:00:00 2001 From: Michihiro NAKAJIMA Date: Sat, 24 Dec 2011 07:54:52 -0500 Subject: [PATCH] Fix build failure using __packed on MSVC. SVN-Revision: 3981 --- libarchive/archive_read_support_format_cpio.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libarchive/archive_read_support_format_cpio.c b/libarchive/archive_read_support_format_cpio.c index a24c5d320..23a2025d0 100644 --- a/libarchive/archive_read_support_format_cpio.c +++ b/libarchive/archive_read_support_format_cpio.c @@ -42,6 +42,10 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_cpio.c 20116 #include "archive_private.h" #include "archive_read_private.h" +#ifdef _MSC_VER +#define __packed +#pragma pack(push, 1) +#endif struct cpio_bin_header { unsigned char c_magic[2]; unsigned char c_dev[2]; @@ -87,6 +91,11 @@ struct cpio_newc_header { char c_crc[8]; } __packed; +#ifdef _MSC_VER +#undef __packed +#pragma pack(pop) +#endif + struct links_entry { struct links_entry *next; struct links_entry *previous; -- 2.47.3