diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-02-22 14:58:06 +0200 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-03-24 09:48:09 +0200 |
| commit | 5c56e4d64d38514c2318b28224e4e896e776a100 (patch) | |
| tree | dab1c40df68593fc9248f1b6ac3cd7973c108d58 /src/libs/3rdparty/libarchive/archive_blake2.h | |
| parent | ac1637b8976d7d85ac42f308c4be6de97dcf86cb (diff) | |
Update libarchive sources to 3.6.0 release
Release details:
https://github.com/libarchive/libarchive/releases/tag/v3.6.0
Change-Id: Ia3d322ffbea70aad2713b7641832f6a56bb75645
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/3rdparty/libarchive/archive_blake2.h')
| -rw-r--r-- | src/libs/3rdparty/libarchive/archive_blake2.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/3rdparty/libarchive/archive_blake2.h b/src/libs/3rdparty/libarchive/archive_blake2.h index dd6fe6fe5..8f6b5e922 100644 --- a/src/libs/3rdparty/libarchive/archive_blake2.h +++ b/src/libs/3rdparty/libarchive/archive_blake2.h @@ -21,8 +21,10 @@ #if defined(_MSC_VER) #define BLAKE2_PACKED(x) __pragma(pack(push, 1)) x __pragma(pack(pop)) -#else +#elif defined(__GNUC__) #define BLAKE2_PACKED(x) x __attribute__((packed)) +#else +#define BLAKE2_PACKED(x) _Pragma("pack 1") x _Pragma("pack 0") #endif #if defined(__cplusplus) |