patch-include_libnfnetlink_linux_nfnetlink_h 1.4 KB

123456789101112131415161718192021222324252627282930313233
  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-05 09:34:31.863222315 +0200
  3. @@ -25,9 +25,9 @@ enum nfnetlink_groups {
  4. /* General form of address family dependent message.
  5. */
  6. struct nfgenmsg {
  7. - u_int8_t nfgen_family; /* AF_xxx */
  8. - u_int8_t version; /* nfnetlink version */
  9. - u_int16_t res_id; /* resource id */
  10. + uint8_t nfgen_family; /* AF_xxx */
  11. + uint8_t version; /* nfnetlink version */
  12. + uint16_t res_id; /* resource id */
  13. };
  14. #define NFNETLINK_V0 0
  15. @@ -59,7 +59,7 @@ struct nfnl_callback
  16. int (*call)(struct sock *nl, struct sk_buff *skb,
  17. struct nlmsghdr *nlh, struct nlattr *cda[]);
  18. const struct nla_policy *policy; /* netlink attribute policy */
  19. - const u_int16_t attr_count; /* number of nlattr's */
  20. + const uint16_t attr_count; /* number of nlattr's */
  21. };
  22. struct nfnetlink_subsystem
  23. @@ -76,7 +76,7 @@ extern int nfnetlink_subsys_unregister(c
  24. extern int nfnetlink_has_listeners(unsigned int group);
  25. extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group,
  26. int echo);
  27. -extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags);
  28. +extern int nfnetlink_unicast(struct sk_buff *skb, uint32_t pid, int flags);
  29. #define MODULE_ALIAS_NFNL_SUBSYS(subsys) \
  30. MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))