File: fix-ftbfs-linux-4.8

package info (click to toggle)
isatapd 0.9.7-5.1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 584 kB
  • sloc: ansic: 1,342; sh: 1,139; makefile: 26
file content (24 lines) | stat: -rw-r--r-- 649 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
From: Bernhard Schmidt <berni@debian.org>
Subject: Fix FTBFS with headers from Linux 4.8+
Bug-Debian: https://bugs.debian.org/844869

Linux 4.8+ adds a few includes to linux/if_tunnel.h, which conflict with
concurrent use of netinet/ip.h. Drop the latter and manually define IP_DF
which is not found anywhere else
--- a/src/tunnel.c
+++ b/src/tunnel.c
@@ -18,10 +18,13 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#include <netinet/ip.h>
 #include <net/if.h>
 #include <linux/if_tunnel.h>
 
+#ifndef IP_DF
+	#define IP_DF	0x4000		/* dont fragment flag */
+#endif
+
 #ifdef HAVE_CONFIG_H
 	#include <config.h>
 #endif