summaryrefslogtreecommitdiff
path: root/libarchive/archive_read_support_format_lha.c
diff options
context:
space:
mode:
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>2011-08-03 01:26:15 -0400
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>2011-08-03 01:26:15 -0400
commit721ad7781169d650bd80db2b0f5507ca52972a14 (patch)
tree4ba1070f36717e75f63e1fd1e965fffbf163561b /libarchive/archive_read_support_format_lha.c
parentb338a1213430b248e0fda8e105073fca27fa7e05 (diff)
downloadlibarchive-721ad7781169d650bd80db2b0f5507ca52972a14.tar.gz
Fix build on Visual Studio.
SVN-Revision: 3521
Diffstat (limited to 'libarchive/archive_read_support_format_lha.c')
-rw-r--r--libarchive/archive_read_support_format_lha.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
index 6bbdf93d..c109b048 100644
--- a/libarchive/archive_read_support_format_lha.c
+++ b/libarchive/archive_read_support_format_lha.c
@@ -1875,7 +1875,7 @@ lzh_br_fillup(struct lzh_stream *strm, struct lzh_br *br)
/*
* x86 proccessor family can read misaligned data without an access error.
*/
-#if defined(__i386__)
+#if defined(__i386__) || (defined(_MSC_VER) && defined(_M_IX86))
# if defined(_WIN32) && !defined(__CYGWIN__)
# define lzh_be16dec(p) _byteswap_ushort(*(const uint16_t *)(p))
# elif defined(be16toh)
@@ -1886,7 +1886,7 @@ lzh_br_fillup(struct lzh_stream *strm, struct lzh_br *br)
# define lzh_be16dec archive_be16dec
# endif
# if defined(_WIN32) && !defined(__CYGWIN__)
-# define lzh_be16dec(p) _byteswap_ulong(*(const uint32_t *)(p))
+# define lzh_be32dec(p) _byteswap_ulong(*(const uint32_t *)(p))
# elif defined(be32toh)
# define lzh_be32dec(p) be32toh(*(const uint32_t *)(p))
# elif defined(betoh32)
@@ -1895,7 +1895,7 @@ lzh_br_fillup(struct lzh_stream *strm, struct lzh_br *br)
# define lzh_be32dec archive_be32dec
# endif
# if defined(_WIN32) && !defined(__CYGWIN__)
-# define lzh_be16dec(p) _byteswap_uint64(*(const uint64_t *)(p))
+# define lzh_be64dec(p) _byteswap_uint64(*(const uint64_t *)(p))
# elif defined(be64toh)
# define lzh_be64dec(p) be64toh(*(const uint64_t *)(p))
# elif defined(betoh64)