diff options
Diffstat (limited to 'networking/libiproute/utils.h')
-rw-r--r-- | networking/libiproute/utils.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/networking/libiproute/utils.h b/networking/libiproute/utils.h index 98634dde7..3ecbb3abd 100644 --- a/networking/libiproute/utils.h +++ b/networking/libiproute/utils.h | |||
@@ -3,8 +3,8 @@ | |||
3 | #define __UTILS_H__ 1 | 3 | #define __UTILS_H__ 1 |
4 | 4 | ||
5 | #include "libbb.h" | 5 | #include "libbb.h" |
6 | #include <asm/types.h> | 6 | //#include <asm/types.h> |
7 | #include <resolv.h> | 7 | //#include <resolv.h> |
8 | 8 | ||
9 | #include "libnetlink.h" | 9 | #include "libnetlink.h" |
10 | #include "ll_map.h" | 10 | #include "ll_map.h" |
@@ -34,10 +34,10 @@ extern void incomplete_command(void) ATTRIBUTE_NORETURN; | |||
34 | 34 | ||
35 | typedef struct | 35 | typedef struct |
36 | { | 36 | { |
37 | __u8 family; | 37 | uint8_t family; |
38 | __u8 bytelen; | 38 | uint8_t bytelen; |
39 | __s16 bitlen; | 39 | int16_t bitlen; |
40 | __u32 data[4]; | 40 | uint32_t data[4]; |
41 | } inet_prefix; | 41 | } inet_prefix; |
42 | 42 | ||
43 | #define DN_MAXADDL 20 | 43 | #define DN_MAXADDL 20 |
@@ -58,7 +58,7 @@ struct ipx_addr { | |||
58 | uint8_t ipx_node[IPX_NODE_LEN]; | 58 | uint8_t ipx_node[IPX_NODE_LEN]; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | extern __u32 get_addr32(char *name); | 61 | extern uint32_t get_addr32(char *name); |
62 | extern int get_addr_1(inet_prefix *dst, char *arg, int family); | 62 | extern int get_addr_1(inet_prefix *dst, char *arg, int family); |
63 | extern int get_prefix_1(inet_prefix *dst, char *arg, int family); | 63 | extern int get_prefix_1(inet_prefix *dst, char *arg, int family); |
64 | extern int get_addr(inet_prefix *dst, char *arg, int family); | 64 | extern int get_addr(inet_prefix *dst, char *arg, int family); |
@@ -69,11 +69,11 @@ extern int get_unsigned(unsigned *val, char *arg, int base); | |||
69 | #define get_byte get_u8 | 69 | #define get_byte get_u8 |
70 | #define get_ushort get_u16 | 70 | #define get_ushort get_u16 |
71 | #define get_short get_s16 | 71 | #define get_short get_s16 |
72 | extern int get_u32(__u32 *val, char *arg, int base); | 72 | extern int get_u32(uint32_t *val, char *arg, int base); |
73 | extern int get_u16(__u16 *val, char *arg, int base); | 73 | extern int get_u16(uint16_t *val, char *arg, int base); |
74 | extern int get_s16(__s16 *val, char *arg, int base); | 74 | extern int get_s16(int16_t *val, char *arg, int base); |
75 | extern int get_u8(__u8 *val, char *arg, int base); | 75 | extern int get_u8(uint8_t *val, char *arg, int base); |
76 | extern int get_s8(__s8 *val, char *arg, int base); | 76 | extern int get_s8(int8_t *val, char *arg, int base); |
77 | 77 | ||
78 | extern const char *format_host(int af, int len, void *addr, char *buf, int buflen); | 78 | extern const char *format_host(int af, int len, void *addr, char *buf, int buflen); |
79 | extern const char *rt_addr_n2a(int af, int len, void *addr, char *buf, int buflen); | 79 | extern const char *rt_addr_n2a(int af, int len, void *addr, char *buf, int buflen); |
@@ -93,7 +93,7 @@ int ipx_pton(int af, const char *src, void *addr); | |||
93 | extern int __iproute2_hz_internal; | 93 | extern int __iproute2_hz_internal; |
94 | extern int __get_hz(void); | 94 | extern int __get_hz(void); |
95 | 95 | ||
96 | static __inline__ int get_hz(void) | 96 | static inline int get_hz(void) |
97 | { | 97 | { |
98 | if (__iproute2_hz_internal == 0) | 98 | if (__iproute2_hz_internal == 0) |
99 | __iproute2_hz_internal = __get_hz(); | 99 | __iproute2_hz_internal = __get_hz(); |