1 --- conntrack-tools-1.4.2.orig/include/bitops.h 2013-02-24 23:23:57.000000000 +0100
2 +++ conntrack-tools-1.4.2/include/bitops.h 2014-04-05 09:39:37.219463608 +0200
7 -static inline void set_bit_u32(int nr, u_int32_t *addr)
8 +static inline void set_bit_u32(int nr, uint32_t *addr)
10 addr[nr >> 5] |= (1UL << (nr & 31));
13 -static inline void unset_bit_u32(int nr, u_int32_t *addr)
14 +static inline void unset_bit_u32(int nr, uint32_t *addr)
16 addr[nr >> 5] &= ~(1UL << (nr & 31));
19 -static inline int test_bit_u32(int nr, const u_int32_t *addr)
20 +static inline int test_bit_u32(int nr, const uint32_t *addr)
22 return ((1UL << (nr & 31)) & (addr[nr >> 5])) != 0;
25 -static inline void set_bit_u16(int nr, u_int16_t *addr)
26 +static inline void set_bit_u16(int nr, uint16_t *addr)
28 addr[nr >> 4] |= (1UL << (nr & 15));
31 -static inline void unset_bit_u16(int nr, u_int16_t *addr)
32 +static inline void unset_bit_u16(int nr, uint16_t *addr)
34 addr[nr >> 4] &= ~(1UL << (nr & 15));
37 -static inline int test_bit_u16(int nr, const u_int16_t *addr)
38 +static inline int test_bit_u16(int nr, const uint16_t *addr)
40 return ((1UL << (nr & 15)) & (addr[nr >> 4])) != 0;