ppp/fix-header-conflict.patch

14 lines
523 B
Diff

Index: ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c
===================================================================
--- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c
+++ ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c
@@ -49,6 +49,8 @@ static char const RCSID[] =
#include <net/ethernet.h>
#include <net/if_arp.h>
#include <linux/ppp_defs.h>
+#define _LINUX_IN_H /* block <linux/in.h> from being included */
+#define _LINUX_IN6_H /* block <linux/in6.h> from being included */
#include <linux/if_pppox.h>
#ifndef _ROOT_PATH