Module Name: src
Committed By: justin
Date: Sun Jan 18 17:06:24 UTC 2015
Modified Files:
src/sys/rump/librump/rumpnet/opt: opt_inet.h
src/sys/rump/net/lib/libnetinet: Makefile.inc
src/sys/rump/net/lib/libnetinet6: Makefile.inc
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpnet/opt/opt_inet.h
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/net/lib/libnetinet/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libnetinet6/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpnet/opt/opt_inet.h
diff -u src/sys/rump/librump/rumpnet/opt/opt_inet.h:1.2 src/sys/rump/librump/rumpnet/opt/opt_inet.h:1.3
--- src/sys/rump/librump/rumpnet/opt/opt_inet.h:1.2 Tue May 26 23:43:39 2009
+++ src/sys/rump/librump/rumpnet/opt/opt_inet.h Sun Jan 18 17:06:24 2015
@@ -1,4 +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 $ */
Index: src/sys/rump/net/lib/libnetinet/Makefile.inc
diff -u src/sys/rump/net/lib/libnetinet/Makefile.inc:1.11 src/sys/rump/net/lib/libnetinet/Makefile.inc:1.12
--- src/sys/rump/net/lib/libnetinet/Makefile.inc:1.11 Wed Aug 14 09:31:42 2013
+++ src/sys/rump/net/lib/libnetinet/Makefile.inc Sun Jan 18 17:06:24 2015
@@ -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 \
Index: src/sys/rump/net/lib/libnetinet6/Makefile.inc
diff -u src/sys/rump/net/lib/libnetinet6/Makefile.inc:1.1 src/sys/rump/net/lib/libnetinet6/Makefile.inc:1.2
--- src/sys/rump/net/lib/libnetinet6/Makefile.inc:1.1 Wed Aug 14 09:31:42 2013
+++ src/sys/rump/net/lib/libnetinet6/Makefile.inc Sun Jan 18 17:06:24 2015
@@ -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 \
