![Stefan Nickl](/assets/img/avatar_default.png)
Commit 035567b279
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>
23 lines
532 B
Diff
23 lines
532 B
Diff
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>
|
|
|