patch-include_libnfnetlink_linux_nfnetlink_h 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. --- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink.h 2008-06-18 14:36:57.000000000 +0200
  2. +++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h 2014-04-08 09:31:12.000000000 +0200
  3. @@ -1,6 +1,6 @@
  4. #ifndef _NFNETLINK_H
  5. #define _NFNETLINK_H
  6. -#include <linux/types.h>
  7. +#include <stdint.h>
  8. #include <libnfnetlink/linux_nfnetlink_compat.h>
  9. enum nfnetlink_groups {
  10. @@ -25,9 +25,9 @@ enum nfnetlink_groups {
  11. /* General form of address family dependent message.
  12. */
  13. struct nfgenmsg {
  14. - u_int8_t nfgen_family; /* AF_xxx */
  15. - u_int8_t version; /* nfnetlink version */
  16. - u_int16_t res_id; /* resource id */
  17. + uint8_t nfgen_family; /* AF_xxx */
  18. + uint8_t version; /* nfnetlink version */
  19. + uint16_t res_id; /* resource id */
  20. };
  21. #define NFNETLINK_V0 0
  22. @@ -59,7 +59,7 @@ struct nfnl_callback
  23. int (*call)(struct sock *nl, struct sk_buff *skb,
  24. struct nlmsghdr *nlh, struct nlattr *cda[]);
  25. const struct nla_policy *policy; /* netlink attribute policy */
  26. - const u_int16_t attr_count; /* number of nlattr's */
  27. + const uint16_t attr_count; /* number of nlattr's */
  28. };
  29. struct nfnetlink_subsystem
  30. @@ -76,7 +76,7 @@ extern int nfnetlink_subsys_unregister(c
  31. extern int nfnetlink_has_listeners(unsigned int group);
  32. extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group,
  33. int echo);
  34. -extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags);
  35. +extern int nfnetlink_unicast(struct sk_buff *skb, uint32_t pid, int flags);
  36. #define MODULE_ALIAS_NFNL_SUBSYS(subsys) \
  37. MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))