Skip to content

Commit 675b482

Browse files
committed
xdbf: use pragma push/pop
1 parent 23f3389 commit 675b482

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

PowerUtils/xdbf.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ enum EXDBFNamespace : uint16_t
2929
XDBF_GPD_NAMESPACE_AVATAR_AWARD_360 = 6
3030
};
3131

32-
#pragma pack(1)
32+
#pragma pack(push, 1)
3333
struct XDBFEntry
3434
{
3535
be<EXDBFNamespace> NamespaceID;
3636
be<uint64_t> ResourceID;
3737
be<uint32_t> Offset;
3838
be<uint32_t> Length;
3939
};
40-
#pragma pack()
40+
#pragma pack(pop)
4141

4242
struct XDBFFreeSpaceEntry
4343
{
@@ -71,31 +71,31 @@ struct XSTCHeader
7171
be<EXDBFLanguage> Language;
7272
};
7373

74-
#pragma pack(1)
74+
#pragma pack(push, 1)
7575
struct XSTRHeader
7676
{
7777
be<uint32_t> Signature;
7878
be<uint32_t> Version;
7979
be<uint32_t> Size;
8080
be<uint16_t> StringCount;
8181
};
82-
#pragma pack()
82+
#pragma pack(pop)
8383

8484
struct XSTREntry
8585
{
8686
be<uint16_t> ID;
8787
be<uint16_t> Length;
8888
};
8989

90-
#pragma pack(1)
90+
#pragma pack(push, 1)
9191
struct XACHHeader
9292
{
9393
be<uint32_t> Signature;
9494
be<uint32_t> Version;
9595
be<uint32_t> Size;
9696
be<uint16_t> AchievementCount;
9797
};
98-
#pragma pack()
98+
#pragma pack(pop)
9999

100100
enum EXACHFlags : uint32_t
101101
{
@@ -164,15 +164,15 @@ struct XTHDHeader
164164
char pad0[0x10];
165165
};
166166

167-
#pragma pack(1)
167+
#pragma pack(push, 1)
168168
struct XGAAHeader
169169
{
170170
be<uint32_t> Signature;
171171
be<uint32_t> Version;
172172
be<uint32_t> Size;
173173
be<uint16_t> Count;
174174
};
175-
#pragma pack()
175+
#pragma pack(pop)
176176

177177
struct XGAAEntry
178178
{

0 commit comments

Comments
 (0)