From 7f9fea18aebd4390a04aec18e671a1be2ccbb871 Mon Sep 17 00:00:00 2001 From: Sylvain Rochet Date: Sat, 2 Jun 2012 17:12:55 +0200 Subject: [PATCH] added pppmy.h in all .c files to easily find conflicts --- src/netif/ppp/auth.c | 2 +- src/netif/ppp/ccp.c | 1 + src/netif/ppp/chap-md5.c | 1 + src/netif/ppp/chap-new.c | 3 +-- src/netif/ppp/chap_ms.c | 1 + src/netif/ppp/eap.c | 1 + src/netif/ppp/ecp.c | 1 + src/netif/ppp/fsm.c | 1 + src/netif/ppp/ipcp.c | 2 +- src/netif/ppp/multilink.c | 1 + src/netif/ppp/options.c | 1 + src/netif/ppp/ppp.c | 2 +- src/netif/ppp/pppcrypt.c | 1 + src/netif/ppp/session.c | 1 + src/netif/ppp/sys-linux.c | 1 + src/netif/ppp/tty.c | 1 + src/netif/ppp/upap.c | 1 + src/netif/ppp/utils.c | 1 + 18 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/netif/ppp/auth.c b/src/netif/ppp/auth.c index 2e9a89c3..cc5e9231 100644 --- a/src/netif/ppp/auth.c +++ b/src/netif/ppp/auth.c @@ -69,7 +69,6 @@ */ #include "lwip/opt.h" -#include "pppmy.h" #include #include @@ -102,6 +101,7 @@ #include #include "pppd.h" +#include "pppmy.h" #include "fsm.h" #include "lcp.h" #include "ccp.h" diff --git a/src/netif/ppp/ccp.c b/src/netif/ppp/ccp.c index 7bd65192..18676c59 100644 --- a/src/netif/ppp/ccp.c +++ b/src/netif/ppp/ccp.c @@ -37,6 +37,7 @@ #include #include "pppd.h" +#include "pppmy.h" #include "fsm.h" #include "ccp.h" #include diff --git a/src/netif/ppp/chap-md5.c b/src/netif/ppp/chap-md5.c index 19756937..1a768836 100644 --- a/src/netif/ppp/chap-md5.c +++ b/src/netif/ppp/chap-md5.c @@ -34,6 +34,7 @@ #include #include #include "pppd.h" +#include "pppmy.h" #include "chap-new.h" #include "chap-md5.h" #include "magic.h" diff --git a/src/netif/ppp/chap-new.c b/src/netif/ppp/chap-new.c index bb20d18b..2d2c409f 100644 --- a/src/netif/ppp/chap-new.c +++ b/src/netif/ppp/chap-new.c @@ -31,13 +31,12 @@ #include "lwip/opt.h" #if PPP_SUPPORT && CHAP_SUPPORT /* don't build if not configured for use in lwipopts.h */ -#include "pppmy.h" - #define RCSID "$Id: chap-new.c,v 1.9 2007/06/19 02:08:35 carlsonj Exp $" #include #include #include "pppd.h" +#include "pppmy.h" #include "session.h" #include "chap-new.h" #include "chap-md5.h" diff --git a/src/netif/ppp/chap_ms.c b/src/netif/ppp/chap_ms.c index f3691bd3..02b16675 100644 --- a/src/netif/ppp/chap_ms.c +++ b/src/netif/ppp/chap_ms.c @@ -86,6 +86,7 @@ #include #include "pppd.h" +#include "pppmy.h" #include "chap-new.h" #include "chap_ms.h" #include "polarssl/md4.h" diff --git a/src/netif/ppp/eap.c b/src/netif/ppp/eap.c index e1542e4d..f65185ad 100644 --- a/src/netif/ppp/eap.c +++ b/src/netif/ppp/eap.c @@ -47,6 +47,7 @@ #if PPP_SUPPORT && EAP_SUPPORT /* don't build if not configured for use in lwipopts.h */ #include "pppd.h" +#include "pppmy.h" #include "polarssl/md5.h" #include "eap.h" diff --git a/src/netif/ppp/ecp.c b/src/netif/ppp/ecp.c index 9b2fdabc..9d08c734 100644 --- a/src/netif/ppp/ecp.c +++ b/src/netif/ppp/ecp.c @@ -67,6 +67,7 @@ static const char rcsid[] = RCSID; #include #include "pppd.h" +#include "pppmy.h" #include "fsm.h" #include "ecp.h" diff --git a/src/netif/ppp/fsm.c b/src/netif/ppp/fsm.c index e34e2eb2..a63fc4e3 100644 --- a/src/netif/ppp/fsm.c +++ b/src/netif/ppp/fsm.c @@ -55,6 +55,7 @@ #include #include "pppd.h" +#include "pppmy.h" #include "fsm.h" static const char rcsid[] = RCSID; diff --git a/src/netif/ppp/ipcp.c b/src/netif/ppp/ipcp.c index eaffe6f1..2dd1962d 100644 --- a/src/netif/ppp/ipcp.c +++ b/src/netif/ppp/ipcp.c @@ -58,8 +58,8 @@ #include #include -#include "pppmy.h" #include "pppd.h" +#include "pppmy.h" #include "fsm.h" #include "ipcp.h" diff --git a/src/netif/ppp/multilink.c b/src/netif/ppp/multilink.c index 3d71e086..30d71aa3 100644 --- a/src/netif/ppp/multilink.c +++ b/src/netif/ppp/multilink.c @@ -51,6 +51,7 @@ #include #include "pppd.h" +#include "pppmy.h" #include "fsm.h" #include "lcp.h" #include "tdb.h" diff --git a/src/netif/ppp/options.c b/src/netif/ppp/options.c index 62ba3b63..1b96012d 100644 --- a/src/netif/ppp/options.c +++ b/src/netif/ppp/options.c @@ -75,6 +75,7 @@ #endif /* PPP_FILTER */ #include "pppd.h" +#include "pppmy.h" #if defined(ultrix) || defined(NeXT) char *strdup __P((char *)); diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c index 0d9f6b6d..b513ece6 100644 --- a/src/netif/ppp/ppp.c +++ b/src/netif/ppp/ppp.c @@ -67,7 +67,6 @@ */ #include "lwip/opt.h" -#include "pppmy.h" #define RCSID "$Id: main.c,v 1.156 2008/06/23 11:47:18 paulus Exp $" @@ -95,6 +94,7 @@ #include #include "pppd.h" +#include "pppmy.h" #include "magic.h" #include "fsm.h" #include "lcp.h" diff --git a/src/netif/ppp/pppcrypt.c b/src/netif/ppp/pppcrypt.c index 3baa16d1..ce9ded8f 100644 --- a/src/netif/ppp/pppcrypt.c +++ b/src/netif/ppp/pppcrypt.c @@ -34,6 +34,7 @@ #if PPP_SUPPORT && MSCHAP_SUPPORT /* don't build if not necessary */ #include "pppd.h" +#include "pppmy.h" #include "pppcrypt.h" diff --git a/src/netif/ppp/session.c b/src/netif/ppp/session.c index 1c095de1..4194f44a 100644 --- a/src/netif/ppp/session.c +++ b/src/netif/ppp/session.c @@ -85,6 +85,7 @@ #include #include #include "pppd.h" +#include "pppmy.h" #include "session.h" #ifdef USE_PAM diff --git a/src/netif/ppp/sys-linux.c b/src/netif/ppp/sys-linux.c index 188b172c..7088c2bb 100644 --- a/src/netif/ppp/sys-linux.c +++ b/src/netif/ppp/sys-linux.c @@ -124,6 +124,7 @@ #include #include "pppd.h" +#include "pppmy.h" #include "fsm.h" #include "ipcp.h" diff --git a/src/netif/ppp/tty.c b/src/netif/ppp/tty.c index 5008f4b0..e6fcb6e4 100644 --- a/src/netif/ppp/tty.c +++ b/src/netif/ppp/tty.c @@ -97,6 +97,7 @@ #include #include "pppd.h" +#include "pppmy.h" #include "fsm.h" #include "lcp.h" diff --git a/src/netif/ppp/upap.c b/src/netif/ppp/upap.c index 298114fc..5eb00944 100644 --- a/src/netif/ppp/upap.c +++ b/src/netif/ppp/upap.c @@ -51,6 +51,7 @@ #include #include "pppd.h" +#include "pppmy.h" #include "upap.h" static bool hide_password = 1; diff --git a/src/netif/ppp/utils.c b/src/netif/ppp/utils.c index 21fb4e5b..72ec0911 100644 --- a/src/netif/ppp/utils.c +++ b/src/netif/ppp/utils.c @@ -58,6 +58,7 @@ #endif #include "pppd.h" +#include "pppmy.h" #include "fsm.h" #include "lcp.h"