summaryrefslogtreecommitdiffstats
path: root/src/libs/3rdparty/libarchive/xxhash.c
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2022-01-20 16:16:46 +0200
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2022-01-21 09:18:24 +0200
commit6233bf7d5645f9b8b4dcd99b1d3691ed15f9829c (patch)
tree10ec66220a2ad72bdc85866b2ffcab1c82fda5d4 /src/libs/3rdparty/libarchive/xxhash.c
parentadd344ee43670a87212639f979ad9a672291076e (diff)
Update libarchive sources to 3.5.2 release
Upstream details: https://github.com/libarchive/libarchive/releases/tag/v3.5.2 Change-Id: I92bc5911bde854c30d0b6515c49b5d512210401f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/3rdparty/libarchive/xxhash.c')
-rw-r--r--src/libs/3rdparty/libarchive/xxhash.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libs/3rdparty/libarchive/xxhash.c b/src/libs/3rdparty/libarchive/xxhash.c
index 70750bae0..f96e9d934 100644
--- a/src/libs/3rdparty/libarchive/xxhash.c
+++ b/src/libs/3rdparty/libarchive/xxhash.c
@@ -150,7 +150,11 @@ typedef struct _U32_S { U32 v; } _PACKED U32_S;
#if GCC_VERSION >= 409
__attribute__((__no_sanitize_undefined__))
#endif
-static inline U32 A32(const void * x)
+#if defined(_MSC_VER)
+static __inline U32 A32(const void * x)
+#else
+static inline U32 A32(const void* x)
+#endif
{
return (((const U32_S *)(x))->v);
}