diff options
| -rw-r--r-- | include/net/if_arp.h | 10 | ||||
| -rw-r--r-- | include/regex.h | 1 | ||||
| -rw-r--r-- | include/signal.h | 2 | ||||
| -rw-r--r-- | include/sys/socket.h | 6 |
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); |