Solve build problems on older systems.

(Logical change 1.27)

diff --git a/lib/ll_types.c b/lib/ll_types.c
index 165ecfa60b5cf95d1967556fcf50da173b525c96..920c2bd01adb46daecf3e3be37812f608886857e 100644 (file)
--- a/lib/ll_types.c
+++ b/lib/ll_types.c
@@ -17,19 +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>
 
-char * ll_type_n2a(int type, char *buf, int len)
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/sockios.h>
+
+#include "rt_names.h"
+
+const char * ll_type_n2a(int type, char *buf, int len)
 {
 #define __PF(f,n) { ARPHRD_##f, #n },
 static struct {
        int type;
-       char *name;
+       const char *name;
 } arphrd_names[] = {
 { 0, "generic" },
 __PF(ETHER,ether)

diff --git a/lib/rt_names.c b/lib/rt_names.c
index 5db7f2c11ed3844f09e13e9a57e2c335010058ec..03df086dd2eae4a4d063071c97020b050381afa4 100644 (file)
--- a/lib/rt_names.c
+++ b/lib/rt_names.c
@@ -71,7 +71,9 @@ static char * rtnl_rtprot_tab[256] = {
        [RTPROT_ZEBRA] ="zebra",
        [RTPROT_BIRD] = "bird",
        [RTPROT_DNROUTED] = "dnrouted",
+#ifdef RTPROT_XORP
        [RTPROT_XORP] = "xorp",
+#endif
 };