From: Renato Westphal <renato@opensourcerouting.org>
Date: Thu, 4 Aug 2016 13:07:31 +0000 (-0300)
Subject: zebra: replace __u32 with standard uint32_t
X-Git-Tag: frr-2.0-rc1~403
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1bb6e9b7fafc20249570727b84fa4101643d9091;p=matthieu%2Ffrr.git

zebra: replace __u32 with standard uint32_t

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/zebra/kernel_null.c b/zebra/kernel_null.c
index 5efc1e2a55..184f223971 100644
--- a/zebra/kernel_null.c
+++ b/zebra/kernel_null.c
@@ -60,7 +60,7 @@ int kernel_address_delete_ipv4 (struct interface *a, struct connected *b)
   return 0;
 }
 
-int netlink_neigh_update (int cmd, int ifindex, __u32 addr, char *lla, int llalen)
+int netlink_neigh_update (int cmd, int ifindex, uint32_t addr, char *lla, int llalen)
 {
   return 0;
 }
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 481ff781e3..9185fbb4ca 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -1974,7 +1974,7 @@ _netlink_route_debug(
 }
 
 int
-netlink_neigh_update (int cmd, int ifindex, __u32 addr, char *lla, int llalen)
+netlink_neigh_update (int cmd, int ifindex, uint32_t addr, char *lla, int llalen)
 {
   struct {
       struct nlmsghdr         n;
diff --git a/zebra/rt_netlink.h b/zebra/rt_netlink.h
index 1d9280a295..5ef5cc37a9 100644
--- a/zebra/rt_netlink.h
+++ b/zebra/rt_netlink.h
@@ -42,7 +42,7 @@ extern const char *
 nl_rtproto_to_str (u_char rtproto);
 
 int
-netlink_neigh_update (int cmd, int ifindex, __u32 addr, char *lla, int llalen);
+netlink_neigh_update (int cmd, int ifindex, uint32_t addr, char *lla, int llalen);
 
 extern int interface_lookup_netlink (struct zebra_ns *zns);
 extern int netlink_route_read (struct zebra_ns *zns);