diff options
| author | Stefan Nickl <Stefan.Nickl@gmail.com> | 2016-10-20 23:12:37 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-10-20 23:38:22 +0200 |
| commit | 9d08404d9afa211b2da4449ee12b2e89dcedc208 (patch) | |
| tree | 91be58efb813fa3160f32c402d4557a1c0c1aebd /package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch | |
| parent | 59b9cc7a2dffcd5eb192609eebe3f6a9a9293462 (diff) | |
| download | buildroot-9d08404d9afa211b2da4449ee12b2e89dcedc208.tar.gz buildroot-9d08404d9afa211b2da4449ee12b2e89dcedc208.zip | |
pppd: better fix for the Linux 4.8 kernel headers issue
Commit 035567b2793f3649e2ddc6cd34b75dd643f47d73 solved the build issue
of pppd with Linux 4.8 kernel headers, but in the process broke the
build with older kernel headers such as 3.10.
This commit takes a different approach, by moving the <netinet/in.h>
include above linux header includes.
Linux uapi headers try to avoid redeclaring things from libc via
linux/libc-compat.h. However that only works if the libc header is
included first.
Signed-off-by: Stefan Nickl <Stefan.Nickl@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch')
| -rw-r--r-- | package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch b/package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch new file mode 100644 index 0000000000..2f6933f5e5 --- /dev/null +++ b/package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch @@ -0,0 +1,22 @@ +diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h +index 9ab2eee..b827620 100644 +--- a/pppd/plugins/rp-pppoe/pppoe.h ++++ b/pppd/plugins/rp-pppoe/pppoe.h +@@ -47,6 +47,8 @@ + #include <sys/socket.h> + #endif + ++#include <netinet/in.h> ++ + /* Ugly header files on some Linux boxes... */ + #if defined(HAVE_LINUX_IF_H) + #include <linux/if.h> +@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t; + #include <linux/if_ether.h> + #endif + +-#include <netinet/in.h> +- + #ifdef HAVE_NETINET_IF_ETHER_H + #include <sys/types.h> + |
