Fix C++ code
- on NetBSD, undef if_name as the macro conflicts with the local use
- don't return a value in a void function
- fix const issues


(joerg)

$NetBSD: patch-fea_io__ip__manager.hh,v 1.1 2020/04/17 00:20:45 joerg Exp $

--- fea/io_ip_manager.hh.orig	2020-04-16 14:48:26.391011767 +0000
+++ fea/io_ip_manager.hh
@@ -22,6 +22,11 @@
 #ifndef __FEA_IO_IP_MANAGER_HH__
 #define __FEA_IO_IP_MANAGER_HH__
 
+#ifdef __NetBSD__
+#include <net/if.h>
+#undef if_name
+#endif
+
 #include <list>
 #include <vector>
 #include <set>

$NetBSD: patch-fea_io__link.hh,v 1.1 2020/04/17 00:20:45 joerg Exp $

--- fea/io_link.hh.orig	2020-04-16 14:47:26.780539843 +0000
+++ fea/io_link.hh
@@ -23,6 +23,11 @@
 #ifndef __FEA_IO_LINK_HH__
 #define __FEA_IO_LINK_HH__
 
+#ifdef __NetBSD__
+#include <net/if.h>
+#undef if_name
+#endif
+
 #include <vector>
 
 #include "fea_data_plane_manager.hh"

$NetBSD: patch-libxipc_finder__msgs.cc,v 1.1 2020/04/17 00:20:45 joerg Exp $

--- libxipc/finder_msgs.cc.orig	2020-04-16 14:37:03.894247926 +0000
+++ libxipc/finder_msgs.cc
@@ -228,8 +228,8 @@ ParsedFinderXrlResponse::ParsedFinderXrl
     : ParsedFinderMessageBase(data, FinderXrlResponse::c_type), _xrl_args(0)
 {
     data += bytes_parsed();
-    char* p0 = strstr(data, "/");
-    char* p1 = strstr(data, "\n");
+    const char* p0 = strstr(data, "/");
+    const char* p1 = strstr(data, "\n");
     if (p0 == 0 || p1 == 0) {
 	xorp_throw(BadFinderMessageFormat, "XrlError not present");
     }

$NetBSD: patch-libxipc_xrl__pf__factory.cc,v 1.1 2020/04/17 00:20:45 joerg Exp $

--- libxipc/xrl_pf_factory.cc.orig	2020-04-16 14:37:52.151875483 +0000
+++ libxipc/xrl_pf_factory.cc
@@ -69,7 +69,7 @@ XrlPFSender*
 XrlPFSenderFactory::create_sender(EventLoop& eventloop,
 				  const char* protocol_colon_address)
 {
-    char *colon = strstr(protocol_colon_address, ":");
+    const char *colon = strstr(protocol_colon_address, ":");
     if (colon == 0) {
 	debug_msg("No colon in supposedly colon separated <protocol><address>"
 		  "combination\n\t\"%s\".\n", protocol_colon_address);

$NetBSD: patch-libxorp_ipvxnet.hh,v 1.1 2020/04/17 00:20:45 joerg Exp $

--- libxorp/ipvxnet.hh.orig	2020-04-16 14:35:42.344739235 +0000
+++ libxorp/ipvxnet.hh
@@ -54,7 +54,7 @@ inline void
 IPNet<IPvX>::initialize_from_string(const char *cp)
     throw (InvalidString, InvalidNetmaskLength)
 {
-    char *slash = strrchr(cp, '/');
+    const char *slash = strrchr(cp, '/');
     if (slash == 0) xorp_throw(InvalidString, "Missing slash");
 
     if (*(slash + 1) == 0)

$NetBSD: patch-mld6igmp_xrl__mld6igmp__node.hh,v 1.1 2020/04/17 00:20:45 joerg Exp $

--- mld6igmp/xrl_mld6igmp_node.hh.orig	2020-04-16 15:02:53.721761291 +0000
+++ mld6igmp/xrl_mld6igmp_node.hh
@@ -22,6 +22,10 @@
 #ifndef __MLD6IGMP_XRL_MLD6IGMP_NODE_HH__
 #define __MLD6IGMP_XRL_MLD6IGMP_NODE_HH__
 
+#ifdef __NetBSD__
+#include <net/if.h>
+#undef if_name
+#endif
 
 //
 // MLD6IGMP XRL-aware node definition.

$NetBSD: patch-pim_xrl__pim__node.hh,v 1.1 2020/04/17 00:20:45 joerg Exp $

--- pim/xrl_pim_node.hh.orig	2020-04-16 15:10:54.106155087 +0000
+++ pim/xrl_pim_node.hh
@@ -22,6 +22,10 @@
 #ifndef __PIM_XRL_PIM_NODE_HH__
 #define __PIM_XRL_PIM_NODE_HH__
 
+#ifdef __NetBSD__
+#include <net/if.h>
+#undef if_name
+#endif
 
 //
 // PIM XRL-aware node definition.

$NetBSD: patch-policy_common_element.cc,v 1.1 2020/04/17 00:20:45 joerg Exp $

--- policy/common/element.cc.orig	2020-04-16 14:40:39.438101634 +0000
+++ policy/common/element.cc
@@ -89,7 +89,7 @@ ElemCom32::ElemCom32(const char* c_str) 
     }
 
     int len = strlen(c_str);
-    char *colon = strstr(c_str, ":");
+    const char *colon = strstr(c_str, ":");
 
     if(len > 0 && colon != NULL) {
 	uint32_t msw, lsw;

$NetBSD: patch-rip_output.hh,v 1.1 2020/04/17 00:20:45 joerg Exp $

--- rip/output.hh.orig	2020-04-16 15:12:16.319176979 +0000
+++ rip/output.hh
@@ -93,7 +93,7 @@ public:
     /**
      * Get number of packets placed on packet queue for output.
      */
-    void packets_sent() const			{ return _pkts_out; }
+    void packets_sent() const			{ return; }
 
 protected:
     /**