f8b58757d0
0d004db Revert "pppd: Include time.h before using time_t" e400854 pppdump: Eliminate printf format warning by using %zd 7f2f0de pppd: Refactor setjmp/longjmp with pipe pair in event wait loop 4e71317 make: Avoid using host include for cross-compiling 3202f89 pppoe: Remove the use of cdefs d8e8d7a pppd: Remove unused rcsid variables 486f854 pppd: Fix GLIBC version test for non-glibc toolchains b6cd558 pppd: Include time.h before using time_t ef8ec11 radius: Fix compiler warning f6330ec magic: Remove K&R style of arguments 347904e Add Submitting-patches.md Remove patches 130-no_cdefs_h.patch, 131-missing_prototype_macro.patch, 132-fix_linux_includes.patch as fixed upstream Refresh patches Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
37 lines
780 B
Diff
37 lines
780 B
Diff
--- a/pppd/plugins/rp-pppoe/pppoe.h
|
|
+++ b/pppd/plugins/rp-pppoe/pppoe.h
|
|
@@ -48,11 +48,7 @@
|
|
#include <netinet/in.h>
|
|
|
|
/* Ugly header files on some Linux boxes... */
|
|
-#if defined(HAVE_LINUX_IF_H)
|
|
-#include <linux/if.h>
|
|
-#elif defined(HAVE_NET_IF_H)
|
|
#include <net/if.h>
|
|
-#endif
|
|
|
|
#ifdef HAVE_NET_IF_TYPES_H
|
|
#include <net/if_types.h>
|
|
@@ -80,20 +76,7 @@ typedef unsigned long UINT32_t;
|
|
#error Could not find a 32-bit integer type
|
|
#endif
|
|
|
|
-#ifdef HAVE_LINUX_IF_ETHER_H
|
|
-#include <linux/if_ether.h>
|
|
-#endif
|
|
-
|
|
-#ifdef HAVE_NETINET_IF_ETHER_H
|
|
-#include <sys/types.h>
|
|
-
|
|
-#ifdef HAVE_SYS_SOCKET_H
|
|
-#include <sys/socket.h>
|
|
-#endif
|
|
-#ifndef HAVE_SYS_DLPI_H
|
|
-#include <netinet/if_ether.h>
|
|
-#endif
|
|
-#endif
|
|
+#include <net/ethernet.h>
|
|
|
|
|
|
/* Ethernet frame types according to RFC 2516 */
|