From 271d3537fed28b3e76cf0e76082b44c8771ac5da Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 18 Jul 2003 12:21:03 +0000 Subject: [PATCH] Remove all #ifndefs from route.c --- lib/ethernet.h | 6 +++++- src/route.c | 20 +------------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/lib/ethernet.h b/lib/ethernet.h index 98e7047..5f6bcd0 100644 --- a/lib/ethernet.h +++ b/lib/ethernet.h @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: ethernet.h,v 1.1.2.1 2003/07/18 12:16:23 guus Exp $ + $Id: ethernet.h,v 1.1.2.2 2003/07/18 12:21:02 guus Exp $ */ #ifndef __TINC_ETHERNET_H__ @@ -27,6 +27,10 @@ #define ETH_ALEN 6 #endif +#ifndef ETHER_ADDR_LEN +#define ETHER_ADDR_LEN 6 +#endif + #ifndef ARPHRD_ETHER #define ARPHRD_ETHER 1 #endif diff --git a/src/route.c b/src/route.c index a6f6e46..323edec 100644 --- a/src/route.c +++ b/src/route.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: route.c,v 1.1.2.60 2003/07/18 12:16:24 guus Exp $ + $Id: route.c,v 1.1.2.61 2003/07/18 12:21:03 guus Exp $ */ #include "system.h" @@ -54,24 +54,6 @@ #include "subnet.h" #include "utils.h" -/* Missing definitions */ - -#ifndef ETHER_ADDR_LEN -#define ETHER_ADDR_LEN 6 -#endif - -#ifndef ICMP_DEST_UNREACH -#define ICMP_DEST_UNREACH 3 -#endif - -#ifndef ICMP_NET_UNKNOWN -#define ICMP_NET_UNKNOWN 6 -#endif - -#ifndef ICMP_NET_UNREACH -#define ICMP_NET_UNREACH 0 -#endif - int routing_mode = RMODE_ROUTER; int priorityinheritance = 0; int macexpire = 600; -- 2.25.1