Use hardcoded value for TUNNEWPPA if net/if_tun.h is missing on Solaris.

Conflicts:
	src/solaris/device.c

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 111fac8f14af94ce5ffd165f270a8ff9822b0146..09d90e2c5caebe42d87839d9ba1c2e26f039afa1 100644 (file)
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -33,6 +33,11 @@
 #include "../utils.h"
 #include "../xalloc.h"
 
 #include "../utils.h"
 #include "../xalloc.h"
 

+#ifndef TUNNEWPPA
+#warning Missing net/if_tun.h, using hardcoded value for TUNNEWPPA
+#define TUNNEWPPA       (('T'<<16) | 0x0001)
+#endif
+

 #define DEFAULT_TUN_DEVICE "/dev/tun"
 #define DEFAULT_TAP_DEVICE "/dev/tap"
 
 #define DEFAULT_TUN_DEVICE "/dev/tun"
 #define DEFAULT_TAP_DEVICE "/dev/tap"
 


@@ -44,7 +49,6 @@ static enum {
 int device_fd = -1;
 static int if_fd = -1;
 static int ip_fd = -1;
 int device_fd = -1;
 static int if_fd = -1;
 static int ip_fd = -1;

-static int arp_fd = -1;

 char *device = NULL;
 char *iface = NULL;
 static char *device_info = NULL;
 char *device = NULL;
 char *iface = NULL;
 static char *device_info = NULL;