Upstream refresh for v1.5.0-rc1 : Upstream 19.07 : 4fb6b8c553f692eeb5bcb203e0f8ee8df0...
[librecmc/librecmc.git] / package / network / services / ppp / patches / 140-pppoe_compile_fix.patch
1 --- a/pppd/plugins/rp-pppoe/pppoe.h
2 +++ b/pppd/plugins/rp-pppoe/pppoe.h
3 @@ -52,11 +52,7 @@
4  #include <netinet/in.h>
5  
6  /* Ugly header files on some Linux boxes... */
7 -#if defined(HAVE_LINUX_IF_H)
8 -#include <linux/if.h>
9 -#elif defined(HAVE_NET_IF_H)
10  #include <net/if.h>
11 -#endif
12  
13  #ifdef HAVE_NET_IF_TYPES_H
14  #include <net/if_types.h>
15 @@ -84,20 +80,7 @@ typedef unsigned long UINT32_t;
16  #error Could not find a 32-bit integer type
17  #endif
18  
19 -#ifdef HAVE_LINUX_IF_ETHER_H
20 -#include <linux/if_ether.h>
21 -#endif
22 -
23 -#ifdef HAVE_NETINET_IF_ETHER_H
24 -#include <sys/types.h>
25 -
26 -#ifdef HAVE_SYS_SOCKET_H
27 -#include <sys/socket.h>
28 -#endif
29 -#ifndef HAVE_SYS_DLPI_H
30 -#include <netinet/if_ether.h>
31 -#endif
32 -#endif
33 +#include <net/ethernet.h>
34  
35  
36  /* Ethernet frame types according to RFC 2516 */