summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2013-03-04 17:05:45 -0500
committerRich Felker <dalias@aerifal.cx>2013-03-04 17:05:45 -0500
commit8c741783fc96d559cfe79301c924c217b2905c0c (patch)
tree7cb6040429516c83e696dbc8fc7a6e96ea3dd2fe
parent99727dad25c6fd852291beef5e0da0a8d2ec8208 (diff)
downloadmusl-8c741783fc96d559cfe79301c924c217b2905c0c.tar.gz
fix some obscure header type size/alignment issues
-rw-r--r--include/net/if_arp.h10
-rw-r--r--include/regex.h1
-rw-r--r--include/signal.h2
-rw-r--r--include/sys/socket.h6
4 files changed, 9 insertions, 10 deletions
diff --git a/include/net/if_arp.h b/include/net/if_arp.h
index bb5eadf1..371ab104 100644
--- a/include/net/if_arp.h
+++ b/include/net/if_arp.h
@@ -117,12 +117,12 @@ struct arpreq_old {
#define ARPD_FLUSH 0x03
struct arpd_request {
- uint16_t req;
+ unsigned short req;
uint32_t ip;
- uint32_t dev;
- uint32_t stamp;
- uint32_t updated;
- uint8_t ha[MAX_ADDR_LEN];
+ unsigned long dev;
+ unsigned long stamp;
+ unsigned long updated;
+ unsigned char ha[MAX_ADDR_LEN];
};
diff --git a/include/regex.h b/include/regex.h
index 2eac1ebf..ea9b894b 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -17,6 +17,7 @@ typedef struct {
size_t re_nsub;
void *__opaque, *__padding[4];
size_t __nsub2;
+ char __padding2;
} regex_t;
typedef struct {
diff --git a/include/signal.h b/include/signal.h
index b8ba1b5a..242b4ad2 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -103,7 +103,7 @@ union sigval {
struct __siginfo {
int si_signo, si_errno, si_code;
union {
- char __pad[128 - 3*sizeof(int)];
+ char __pad[128 - 2*sizeof(int) - sizeof(long)];
struct {
pid_t si_pid;
uid_t si_uid;
diff --git a/include/sys/socket.h b/include/sys/socket.h
index cf042eb1..97126669 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -239,10 +239,8 @@ struct sockaddr
struct sockaddr_storage
{
sa_family_t ss_family;
- union {
- long long __align;
- char __padding[126];
- } __padding;
+ unsigned long __ss_align;
+ char __ss_padding[128-2*sizeof(unsigned long)];
};
int socket (int, int, int);