[src/trunk]: src/sys/rump Move defines of INET and INET6 from opt_inet.h to M...

[justin <justin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3664cb45754a
branches:  trunk
changeset: 335634:3664cb45754a
user:      justin <justin%NetBSD.org@localhost>
date:      Sun Jan 18 17:06:24 2015 +0000

description:
Move defines of INET and INET6 from opt_inet.h to Makefile.inc

As discussed with pooka@
fixes current issues with ipv6 on rump being broken

diffstat:

 sys/rump/librump/rumpnet/opt/opt_inet.h   |  5 +----
 sys/rump/net/lib/libnetinet/Makefile.inc  |  4 +++-
 sys/rump/net/lib/libnetinet6/Makefile.inc |  4 +++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r bef4c3a26628 -r 3664cb45754a sys/rump/librump/rumpnet/opt/opt_inet.h
--- a/sys/rump/librump/rumpnet/opt/opt_inet.h   Sun Jan 18 16:37:05 2015 +0000
+++ b/sys/rump/librump/rumpnet/opt/opt_inet.h   Sun Jan 18 17:06:24 2015 +0000
@@ -1,4 +1,1 @@
-/*     $NetBSD: opt_inet.h,v 1.2 2009/05/26 23:43:39 pooka Exp $       */
-
-#define INET  1
-#define INET6 1
+/*     $NetBSD: opt_inet.h,v 1.3 2015/01/18 17:06:24 justin Exp $      */
diff -r bef4c3a26628 -r 3664cb45754a sys/rump/net/lib/libnetinet/Makefile.inc
--- a/sys/rump/net/lib/libnetinet/Makefile.inc  Sun Jan 18 16:37:05 2015 +0000
+++ b/sys/rump/net/lib/libnetinet/Makefile.inc  Sun Jan 18 17:06:24 2015 +0000
@@ -1,8 +1,10 @@
-#      $NetBSD: Makefile.inc,v 1.11 2013/08/14 09:31:42 pooka Exp $
+#      $NetBSD: Makefile.inc,v 1.12 2015/01/18 17:06:24 justin Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../netinet
 
+CPPFLAGS+=     -DINET
+
 # INET
 SRCS+= in_proto.c igmp.c in.c in_offload.c in_pcb.c ip_carp.c ip_icmp.c\
        ip_flow.c ip_id.c ip_input.c ip_reass.c ip_output.c raw_ip.c    \
diff -r bef4c3a26628 -r 3664cb45754a sys/rump/net/lib/libnetinet6/Makefile.inc
--- a/sys/rump/net/lib/libnetinet6/Makefile.inc Sun Jan 18 16:37:05 2015 +0000
+++ b/sys/rump/net/lib/libnetinet6/Makefile.inc Sun Jan 18 17:06:24 2015 +0000
@@ -1,8 +1,10 @@
-#      $NetBSD: Makefile.inc,v 1.1 2013/08/14 09:31:42 pooka Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2015/01/18 17:06:24 justin Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../netinet6
 
+CPPFLAGS+=     -DINET6
+
 # INET6
 SRCS+= dest6.c frag6.c icmp6.c in6.c in6_cksum.c in6_ifattach.c        \
        in6_offload.c in6_pcb.c in6_proto.c in6_src.c ip6_flow.c        \