From: osdl.org!shemminger <osdl.org!shemminger>
Date: Wed, 9 Jun 2004 22:53:56 +0000 (+0000)
Subject: more build problems on older systems.
X-Git-Tag: v2_6_7-040701~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea7436fb2d6ef8564ea7cc755b9338fcdafcb7c4;p=thirdparty%2Fiproute2.git

more build problems on older systems.

(Logical change 1.28)
---

diff --git a/lib/ll_addr.c b/lib/ll_addr.c
index 082cb3c45..ea3d66092 100644
--- a/lib/ll_addr.c
+++ b/lib/ll_addr.c
@@ -17,13 +17,15 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
-#include <linux/sockios.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
 
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/sockios.h>
+
+#include "rt_names.h"
 #include "utils.h"
 
 
diff --git a/lib/ll_proto.c b/lib/ll_proto.c
index 71f149dc2..98c67fe5f 100644
--- a/lib/ll_proto.c
+++ b/lib/ll_proto.c
@@ -17,20 +17,22 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
-#include <linux/sockios.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
 
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/sockios.h>
+
 #include "utils.h"
+#include "rt_names.h"
 
 
 #define __PF(f,n) { ETH_P_##f, #n },
 static struct {
 	int id;
-	char *name;
+	const char *name;
 } llproto_names[] = {
 __PF(LOOP,loop)
 __PF(PUP,pup)  
@@ -97,7 +99,7 @@ __PF(ECONET,econet)
 #undef __PF
 
 
-char * ll_proto_n2a(unsigned short id, char *buf, int len)
+const char * ll_proto_n2a(unsigned short id, char *buf, int len)
 {
         int i;