[src/trunk]: src Fix rump.ndp -I options by rump-ifying if_nametoindex(3)

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b5cd948c0b81
branches:  trunk
changeset: 810492:b5cd948c0b81
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Tue Sep 01 09:54:34 2015 +0000

description:
Fix rump.ndp -I options by rump-ifying if_nametoindex(3)

>From s-yamaguchi@IIJ

diffstat:

 lib/libc/net/if_nametoindex.c |  8 ++++++--
 usr.sbin/ndp/Makefile         |  4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r 7667db195579 -r b5cd948c0b81 lib/libc/net/if_nametoindex.c
--- a/lib/libc/net/if_nametoindex.c     Tue Sep 01 08:52:02 2015 +0000
+++ b/lib/libc/net/if_nametoindex.c     Tue Sep 01 09:54:34 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_nametoindex.c,v 1.4 2000/11/24 08:21:12 itojun Exp $        */
+/*     $NetBSD: if_nametoindex.c,v 1.5 2015/09/01 09:54:34 ozaki-r Exp $       */
 /*     $KAME: if_nametoindex.c,v 1.6 2000/11/24 08:18:54 itojun Exp $  */
 
 /*-
@@ -28,10 +28,12 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: if_nametoindex.c,v 1.4 2000/11/24 08:21:12 itojun Exp $");
+__RCSID("$NetBSD: if_nametoindex.c,v 1.5 2015/09/01 09:54:34 ozaki-r Exp $");
 #endif /* LIBC_SCCS and not lint */
 
+#ifndef RUMP_ACTION
 #include "namespace.h"
+#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>
@@ -41,9 +43,11 @@
 #include <string.h>
 #include <errno.h>
 
+#ifndef RUMP_ACTION
 #ifdef __weak_alias
 __weak_alias(if_nametoindex,_if_nametoindex)
 #endif
+#endif
 
 /*
  * From RFC 2553:
diff -r 7667db195579 -r b5cd948c0b81 usr.sbin/ndp/Makefile
--- a/usr.sbin/ndp/Makefile     Tue Sep 01 08:52:02 2015 +0000
+++ b/usr.sbin/ndp/Makefile     Tue Sep 01 09:54:34 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/08/03 09:51:40 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.11 2015/09/01 09:54:34 ozaki-r Exp $
 
 .include <bsd.own.mk>
 
@@ -15,7 +15,7 @@
 CPPFLAGS+=     -I. -I${TCPDUMP}
 
 .PATH:         ${.CURDIR}/../../lib/libc/net
-RUMPSRCS=      getifaddrs.c getnameinfo.c if_indextoname.c
+RUMPSRCS=      getifaddrs.c getnameinfo.c if_indextoname.c if_nametoindex.c
 .if (${MKRUMP} != "no")
 CPPFLAGS+=     -DRUMP_ACTION
 .endif