ipfw2 - Rename FreeBSD ipfw port to ipfw3 (2)
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 13 Mar 2015 00:27:14 +0000 (17:27 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 13 Mar 2015 00:27:14 +0000 (17:27 -0700)
* Unbreak buildworld

lib/libipfw3/basic/ipfw3_basic.h
lib/libipfw3/dummynet/ipfw3_dummynet.h
lib/libipfw3/layer2/ipfw3_layer2.h
lib/libipfw3/layer4/ipfw3_layer4.h
lib/libipfw3/nat/ipfw3_nat.c [moved from lib/libipfw3/nat/ipfw2_nat.c with 100% similarity]
lib/libipfw3/nat/ipfw3_nat.h [moved from lib/libipfw3/nat/ipfw2_nat.h with 97% similarity]

index eeacc07..1f8febb 100644 (file)
@@ -35,6 +35,6 @@
 #ifndef _IPFW_BASIC_H
 #define _IPFW_BASIC_H
 
-#include <../../../sys/net/ipfw3_basic/ip_fw3_basic.h>
+#include "../../../sys/net/ipfw3_basic/ip_fw3_basic.h"
 
 #endif
index a1c5dcf..bed4df1 100644 (file)
@@ -35,6 +35,6 @@
 #ifndef _IPFW_DUMMYNET_H
 #define _IPFW_DUMMYNET_H
 
-#include "../../../../sys/net/dummynet3/ip_dummynet3.h"
+#include "../../../sys/net/dummynet3/ip_dummynet3.h"
 
 #endif
index 13bca09..7e433da 100644 (file)
@@ -35,6 +35,6 @@
 #ifndef _IPFW_LAYER2_H
 #define _IPFW_LAYER2_H
 
-#include "../../../../sys/net/ipfw3_layer2/ip_fw3_layer2.h"
+#include "../../../sys/net/ipfw3_layer2/ip_fw3_layer2.h"
 
 #endif
index efe1f35..5438fae 100644 (file)
@@ -35,6 +35,6 @@
 #ifndef _IPFW_LAYER2_H
 #define _IPFW_LAYER2_H
 
-#include "../../../../sys/net/ipfw3_layer4/ip_fw3_layer4.h"
+#include "../../../sys/net/ipfw3_layer4/ip_fw3_layer4.h"
 
 #endif
similarity index 97%
rename from lib/libipfw3/nat/ipfw2_nat.h
rename to lib/libipfw3/nat/ipfw3_nat.h
index adc4cc2..0c5da17 100644 (file)
@@ -35,6 +35,6 @@
 #ifndef _IPFW_NAT_H
 #define _IPFW_NAT_H
 
-#include "../../../../sys/net/ipfw3_nat/ip_fw3_nat.h"
+#include "../../../sys/net/ipfw3_nat/ip_fw3_nat.h"
 
 #endif