diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-01-29 13:33:34 +0300 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-01-29 13:33:34 +0300 |
| commit | 8c69afd992d7cc6c2fc7dea59c3c2bd3f3c21f15 (patch) | |
| tree | 998a337ecd57b737423a3793365519213f97da72 /include | |
| parent | c882f341cec8451ee87af6746abb7208272d5b1a (diff) | |
- be C99 friendly. Anonymous unions are a GNU extension. This change is
size-neutral WRT -std=gnu99 and fixes several compilation errors for strict
C99 mode.
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 2 | ||||
| -rw-r--r-- | include/platform.h | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/libbb.h b/include/libbb.h index c5b685985..525162d05 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -340,7 +340,7 @@ typedef struct len_and_sockaddr { #if ENABLE_FEATURE_IPV6 struct sockaddr_in6 sin6; #endif - }; + } u; } len_and_sockaddr; enum { LSA_SIZEOF_SA = sizeof( diff --git a/include/platform.h b/include/platform.h index 1706de0bf..2daa077af 100644 --- a/include/platform.h +++ b/include/platform.h @@ -154,12 +154,11 @@ typedef int socklen_t; /* linux/loop.h relies on __u64. Make sure we have that as a proper type * until userspace is widely fixed. */ -#ifndef __GNUC__ -#if defined __INTEL_COMPILER +#if (defined __INTEL_COMPILER && !defined __GNUC__) || \ + (defined __GNUC__ && defined __STRICT_ANSI__) __extension__ typedef __signed__ long long __s64; __extension__ typedef unsigned long long __u64; -#endif /* __INTEL_COMPILER */ -#endif /* ifndef __GNUC__ */ +#endif /*----- Kernel versioning ------------------------------------*/ #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) |