From 7fb9d20fcfe5619a2dfb05085f9da5590820ecb5 Mon Sep 17 00:00:00 2001
From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 26 May 2017 13:44:29 -0400
Subject: [PATCH] lib: Remove typedef from ipaddr

The ipaddr_t type was conflicting with code on omnios.

Remove the typedef

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---
 lib/ipaddr.h | 10 +++++-----
 lib/prefix.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/ipaddr.h b/lib/ipaddr.h
index 3425d73fd8..ea98a1b746 100644
--- a/lib/ipaddr.h
+++ b/lib/ipaddr.h
@@ -35,7 +35,7 @@ enum ipaddr_type_t
   IPADDR_V6 = 2,            /* IPv6 */
 };
 
-typedef struct ipaddr
+struct ipaddr
 {
   enum ipaddr_type_t ipa_type;
   union
@@ -46,7 +46,7 @@ typedef struct ipaddr
     } ip;
 #define ipaddr_v4 ip._v4_addr
 #define ipaddr_v6 ip._v6_addr
-} ipaddr_t;
+};
 
 #define IS_IPADDR_NONE(p) ((p)->ipa_type == IPADDR_NONE)
 #define IS_IPADDR_V4(p)   ((p)->ipa_type == IPADDR_V4)
@@ -56,11 +56,11 @@ typedef struct ipaddr
 #define SET_IPADDR_V6(p)  (p)->ipa_type = IPADDR_V6
 
 static inline int
-str2ipaddr (const char *str, ipaddr_t *ip)
+str2ipaddr (const char *str, struct ipaddr *ip)
 {
   int ret;
 
-  memset (ip, 0, sizeof (ipaddr_t));
+  memset (ip, 0, sizeof (struct ipaddr));
 
   ret = inet_pton (AF_INET, str, &ip->ipaddr_v4);
   if (ret > 0) /* Valid IPv4 address. */
@@ -79,7 +79,7 @@ str2ipaddr (const char *str, ipaddr_t *ip)
 }
 
 static inline char *
-ipaddr2str (ipaddr_t *ip, char *buf, int size)
+ipaddr2str (struct ipaddr *ip, char *buf, int size)
 {
   buf[0] = '\0';
   if (ip)
diff --git a/lib/prefix.h b/lib/prefix.h
index 3d2621c910..549798e92e 100644
--- a/lib/prefix.h
+++ b/lib/prefix.h
@@ -66,7 +66,7 @@ struct evpn_addr
   u_char ip_prefix_length;
   struct ethaddr mac;
   uint32_t eth_tag;
-  ipaddr_t ip;
+  struct ipaddr ip;
 #if 0
   union
   {
-- 
2.39.5