fix some obscure header type size/alignment issues

This commit is contained in:
Rich Felker 2013-03-04 17:05:45 -05:00
parent 99727dad25
commit 8c741783fc
4 changed files with 9 additions and 10 deletions

View File

@ -117,12 +117,12 @@ struct arpreq_old {
#define ARPD_FLUSH 0x03 #define ARPD_FLUSH 0x03
struct arpd_request { struct arpd_request {
uint16_t req; unsigned short req;
uint32_t ip; uint32_t ip;
uint32_t dev; unsigned long dev;
uint32_t stamp; unsigned long stamp;
uint32_t updated; unsigned long updated;
uint8_t ha[MAX_ADDR_LEN]; unsigned char ha[MAX_ADDR_LEN];
}; };

View File

@ -17,6 +17,7 @@ typedef struct {
size_t re_nsub; size_t re_nsub;
void *__opaque, *__padding[4]; void *__opaque, *__padding[4];
size_t __nsub2; size_t __nsub2;
char __padding2;
} regex_t; } regex_t;
typedef struct { typedef struct {

View File

@ -103,7 +103,7 @@ union sigval {
struct __siginfo { struct __siginfo {
int si_signo, si_errno, si_code; int si_signo, si_errno, si_code;
union { union {
char __pad[128 - 3*sizeof(int)]; char __pad[128 - 2*sizeof(int) - sizeof(long)];
struct { struct {
pid_t si_pid; pid_t si_pid;
uid_t si_uid; uid_t si_uid;

View File

@ -239,10 +239,8 @@ struct sockaddr
struct sockaddr_storage struct sockaddr_storage
{ {
sa_family_t ss_family; sa_family_t ss_family;
union { unsigned long __ss_align;
long long __align; char __ss_padding[128-2*sizeof(unsigned long)];
char __padding[126];
} __padding;
}; };
int socket (int, int, int); int socket (int, int, int);