diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h index b06eda5..dafa36c 100644 --- a/include/net/ppp_defs.h +++ b/include/net/ppp_defs.h @@ -38,6 +38,8 @@ #ifndef _PPP_DEFS_H_ #define _PPP_DEFS_H_ +#include <sys/time.h> + /* * The basic PPP frame. */ diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux index a74c914..7acd2cf 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux @@ -126,7 +126,7 @@ LIBS += -lcrypt endif ifdef USE_LIBUTIL -CFLAGS += -DHAVE_LOGWTMP=1 +#CFLAGS += -DHAVE_LOGWTMP=1 LIBS += -lutil endif diff --git a/pppd/magic.h b/pppd/magic.h index c81213b..305aece 100644 --- a/pppd/magic.h +++ b/pppd/magic.h @@ -43,5 +43,7 @@ */ +#include <sys/cdefs.h> + void magic_init (void); /* Initialize the magic number generator */ u_int32_t magic (void); /* Returns the next magic number */ diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c index 91e9a57..9c0fac3 100644 --- a/pppd/plugins/rp-pppoe/if.c +++ b/pppd/plugins/rp-pppoe/if.c @@ -30,10 +30,6 @@ static char const RCSID[] = #include <linux/if_packet.h> #endif -#ifdef HAVE_NET_ETHERNET_H -#include <net/ethernet.h> -#endif - #ifdef HAVE_ASM_TYPES_H #include <asm/types.h> #endif diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c index a8c2bb4..ca34d79 100644 --- a/pppd/plugins/rp-pppoe/plugin.c +++ b/pppd/plugins/rp-pppoe/plugin.c @@ -46,7 +46,6 @@ static char const RCSID[] = #include <unistd.h> #include <fcntl.h> #include <signal.h> -#include <net/ethernet.h> #include <net/if_arp.h> #include <linux/ppp_defs.h> #include <linux/if_pppox.h> diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c index 3d3bf4e..b5f82d3 100644 --- a/pppd/plugins/rp-pppoe/pppoe-discovery.c +++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c @@ -27,10 +27,6 @@ #include <linux/if_packet.h> #endif -#ifdef HAVE_NET_ETHERNET_H -#include <net/ethernet.h> -#endif - #ifdef HAVE_ASM_TYPES_H #include <asm/types.h> #endif @@ -55,6 +51,8 @@ void die(int status) exit(status); } +#define error(x...) fprintf(stderr, x) + /* Initialize frame types to RFC 2516 values. Some broken peers apparently use different frame types... sigh... */ --- ppp-ppp-2.4.8/pppd/plugins/rp-pppoe/pppoe.h.old 2019-12-31 01:31:26.000000000 +0000 +++ ppp-ppp-2.4.8/pppd/plugins/rp-pppoe/pppoe.h 2020-02-26 04:01:48.414595401 +0000 @@ -46,6 +46,7 @@ /* This has to be included before Linux 4.8's linux/in.h * gets dragged in. */ #include <netinet/in.h> +#include <netinet/if_ether.h> /* Ugly header files on some Linux boxes... */ #if defined(HAVE_LINUX_IF_H)