1
0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00

Use correct native types with "alignas(1)".

This commit is contained in:
Markus F.X.J. Oberhumer 2021-01-04 21:13:49 +01:00
parent 9aef7b0d6f
commit a8fa3ca5cf
2 changed files with 8 additions and 8 deletions

View File

@ -93,8 +93,8 @@ protected:
// must agree with stub/linux.hh
__packed_struct(b_info) // 12-byte header before each compressed block
unsigned sz_unc; // uncompressed_size
unsigned sz_cpr; // compressed_size
NE32 sz_unc; // uncompressed_size
NE32 sz_cpr; // compressed_size
unsigned char b_method; // compression algorithm
unsigned char b_ftid; // filter id
unsigned char b_cto8; // filter parameter
@ -110,9 +110,9 @@ protected:
__packed_struct_end()
__packed_struct(p_info) // 12-byte packed program header
unsigned p_progid;
unsigned p_filesize;
unsigned p_blocksize;
NE32 p_progid;
NE32 p_filesize;
NE32 p_blocksize;
__packed_struct_end()
struct l_info linfo;

View File

@ -318,13 +318,13 @@ void PackVmlinuxBase<T>::pack(OutputFile *fo)
throwInternalError("Ehdr compression failed");
__packed_struct(b_info) // 12-byte header before each compressed block
unsigned sz_unc; // uncompressed_size
unsigned sz_cpr; // compressed_size
NE32 sz_unc; // uncompressed_size
NE32 sz_cpr; // compressed_size
unsigned char b_method; // compression algorithm
unsigned char b_ftid; // filter id
unsigned char b_cto8; // filter parameter
unsigned char b_unused; // FIXME: !=0 for partial-block unfilter
// unsigned f_offset, f_len; // only if partial-block unfilter
// NE32 f_offset, f_len; // only if partial-block unfilter
__packed_struct_end()
struct b_info hdr_info;