patch-include_bitops_h 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  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
  3. @@ -3,32 +3,32 @@
  4. #include <stdlib.h>
  5. -static inline void set_bit_u32(int nr, u_int32_t *addr)
  6. +static inline void set_bit_u32(int nr, uint32_t *addr)
  7. {
  8. addr[nr >> 5] |= (1UL << (nr & 31));
  9. }
  10. -static inline void unset_bit_u32(int nr, u_int32_t *addr)
  11. +static inline void unset_bit_u32(int nr, uint32_t *addr)
  12. {
  13. addr[nr >> 5] &= ~(1UL << (nr & 31));
  14. }
  15. -static inline int test_bit_u32(int nr, const u_int32_t *addr)
  16. +static inline int test_bit_u32(int nr, const uint32_t *addr)
  17. {
  18. return ((1UL << (nr & 31)) & (addr[nr >> 5])) != 0;
  19. }
  20. -static inline void set_bit_u16(int nr, u_int16_t *addr)
  21. +static inline void set_bit_u16(int nr, uint16_t *addr)
  22. {
  23. addr[nr >> 4] |= (1UL << (nr & 15));
  24. }
  25. -static inline void unset_bit_u16(int nr, u_int16_t *addr)
  26. +static inline void unset_bit_u16(int nr, uint16_t *addr)
  27. {
  28. addr[nr >> 4] &= ~(1UL << (nr & 15));
  29. }
  30. -static inline int test_bit_u16(int nr, const u_int16_t *addr)
  31. +static inline int test_bit_u16(int nr, const uint16_t *addr)
  32. {
  33. return ((1UL << (nr & 15)) & (addr[nr >> 4])) != 0;
  34. }