| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647 |
- --- a/pppd/plugins/rp-pppoe/pppoe.h
- +++ b/pppd/plugins/rp-pppoe/pppoe.h
- @@ -52,11 +52,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>
- @@ -84,20 +80,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 */
- --- a/pppd/plugins/rp-pppoe/Makefile.linux
- +++ b/pppd/plugins/rp-pppoe/Makefile.linux
- @@ -33,7 +33,7 @@ pppoe-discovery: pppoe-discovery.o debug
- $(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o
-
- pppoe-discovery.o: pppoe-discovery.c
- - $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c
- + $(CC) $(CFLAGS) -I../../.. -c -o pppoe-discovery.o pppoe-discovery.c
-
- debug.o: debug.c
- $(CC) $(CFLAGS) -c -o debug.o debug.c
|
