diff options
| author | Eivind Næss <eivnaes@yahoo.com> | 2022-05-30 20:50:55 -0700 |
|---|---|---|
| committer | Eivind Næss <eivnaes@yahoo.com> | 2022-07-15 15:25:39 -0700 |
| commit | 509f04959ad891d7f981f035ed461d51bd1f74b0 (patch) | |
| tree | 21ec7dd22b49fff63dd92f56793224e871627f69 /pppd | |
| parent | 0ef528de9025051a4ab82e73ffd013edf2d6e4c5 (diff) | |
| download | ppp-509f04959ad891d7f981f035ed461d51bd1f74b0.tar.gz | |
The use of <net/ppp_defs.h> isn't guranteed to exist on Linux (e.g. uclibc, buildroot, others)
The one provided by glibc simply includes <linux/ppp_defs.h>. This include is still needed on SunOS
Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
Diffstat (limited to 'pppd')
| -rw-r--r-- | pppd/ccp.c | 6 | ||||
| -rw-r--r-- | pppd/chap_ms.c | 6 | ||||
| -rw-r--r-- | pppd/peap.c | 1 | ||||
| -rw-r--r-- | pppd/pppd.h | 4 | ||||
| -rw-r--r-- | pppd/sha1.c | 1 |
5 files changed, 14 insertions, 4 deletions
@@ -36,11 +36,15 @@ #include <stdlib.h> #include <string.h> +#if defined(SOL2) +#include <net/ppp-comp.h> +#else +#include <linux/ppp-comp.h> +#endif #include "pppd.h" #include "fsm.h" #include "ccp.h" -#include <net/ppp-comp.h> #include "chap_ms.h" #include "mppe.h" diff --git a/pppd/chap_ms.c b/pppd/chap_ms.c index e7e8cba..8e59280 100644 --- a/pppd/chap_ms.c +++ b/pppd/chap_ms.c @@ -87,6 +87,11 @@ #include <sys/types.h> #include <sys/time.h> #include <unistd.h> +#if defined(SOL2) +#include <net/ppp-comp.h> +#else +#include <linux/ppp-comp.h> +#endif #include "pppd.h" #include "chap-new.h" @@ -130,7 +135,6 @@ static char *mschap2_peer_challenge = NULL; #include "fsm.h" /* Need to poke MPPE options */ #include "ccp.h" -#include <net/ppp-comp.h> #endif /* diff --git a/pppd/peap.c b/pppd/peap.c index 414fa11..d6e5fcf 100644 --- a/pppd/peap.c +++ b/pppd/peap.c @@ -56,7 +56,6 @@ #include <openssl/hmac.h> #include <openssl/rand.h> #include <openssl/err.h> -#include <net/ppp_defs.h> #include "pppd.h" #include "eap.h" diff --git a/pppd/pppd.h b/pppd/pppd.h index d7b431d..e59e0e5 100644 --- a/pppd/pppd.h +++ b/pppd/pppd.h @@ -53,7 +53,11 @@ #include <stdarg.h> #include <stdint.h> #include <sys/types.h> /* for u_int32_t, if defined */ +#if defined(SOL2) #include <net/ppp_defs.h> +#else +#include <linux/ppp_defs.h> +#endif #ifdef PPP_WITH_IPV6CP #if defined(SOL2) diff --git a/pppd/sha1.c b/pppd/sha1.c index efb37be..4fc5345 100644 --- a/pppd/sha1.c +++ b/pppd/sha1.c @@ -23,7 +23,6 @@ #include <string.h> #include <time.h> #include <netinet/in.h> /* htonl() */ -#include <net/ppp_defs.h> #include "sha1.h" static void |