RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 20:15:07 +00:00
Code Issues Activity Actions

LibC: Fix redeclaration in x86_64/regs.h

Browse source 
In QtCreator (and under weird configurations with gcc), this used to
fail with the error messages like: "error: member of anonymous union
redeclares '___'".

This patch gives each member a unique name.
This commit is contained in:
Ben Wiederhake 2021-09-16 20:45:42 +02:00 • committed by Linus Groh
parent 8ba572d650
commit f9a4f4f7e6
1 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

84
Userland/Libraries/LibC/sys/arch/x86_64/regs.h
View file

@ -8,25 +8,25 @@
#include <AK/Types.h>
#define RREGISTER(num) \
union { \
u64 r##num; \
struct { \
u32 _; \
union { \
u32 r##num##d; \
struct { \
u16 __; \
union { \
u16 r##num##w; \
struct { \
u8 ___; \
u8 r##num##b; \
}; \
}; \
}; \
}; \
}; \
#define RREGISTER(num) \
union { \
u64 r##num; \
struct { \
u32 _unused##num; \
union { \
u32 r##num##d; \
struct { \
u16 __unused##num; \
union { \
u16 r##num##w; \
struct { \
u8 ___unused##num; \
u8 r##num##b; \
}; \
}; \
}; \
}; \
}; \
}
#define GPREGISTER(letter) \
@ -34,12 +34,12 @@
u64 r##letter##x; \
struct \
{ \
u32 _; \
u32 _unused##letter; \
union { \
u32 e##letter##x; \
struct \
{ \
u16 __; \
u16 __unused##letter; \
union { \
u16 letter##x; \
struct { \
@ -52,27 +52,27 @@
}; \
}
#define SPREGISTER(name) \
union { \
u64 r##name; \
struct \
{ \
u32 _; \
union { \
u32 e##name; \
struct \
{ \
u16 __; \
union { \
u16 name; \
struct { \
u8 ___; \
u8 name##l; \
}; \
}; \
}; \
}; \
}; \
#define SPREGISTER(name) \
union { \
u64 r##name; \
struct \
{ \
u32 _unused##name; \
union { \
u32 e##name; \
struct \
{ \
u16 __unused##name; \
union { \
u16 name; \
struct { \
u8 ___unused##name; \
u8 name##l; \
}; \
}; \
}; \
}; \
}; \
}
struct [[gnu::packed]] PtraceRegisters {