The use of <net/ppp_defs.h> isn't guranteed to exist on Linux (e.g. uclibc, buildroot...

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>

diff --git a/pppd/ccp.c b/pppd/ccp.c
index cfe94f8e9f3af44813a6e2cda02b2243924df956..088a163c3f68370623b09ee3ecf61ea6436ca419 100644 (file)
--- a/pppd/ccp.c
+++ b/pppd/ccp.c
@@ -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 e7e8cbadfc2ff71333c11e25e83d384a3e3f42fe..8e59280cbee6aab7b284b13a5222fa2b322a2f8e 100644 (file)
--- 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 414fa1194fb36345634cec46b6a42b54fb3ce541..d6e5fcff9012edc68f5e902808b44a9164e91a1b 100644 (file)
--- 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 d7b431d1faed210d7ead40584303de36490e793a..e59e0e508058d03dd9729129f68280f999ca1308 100644 (file)
--- 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 efb37bec40fe5b3ba0f0c456028cc887532f47eb..4fc53458c076312170f5632c2593851305dae271 100644 (file)
--- 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

diff --git a/pppdump/bsd-comp.c b/pppdump/bsd-comp.c
index 7ad62892752fe79508666128337170293bd7f5a7..57f936c5ed0004650f43a928eaf98f66aaa00041 100644 (file)
--- a/pppdump/bsd-comp.c
+++ b/pppdump/bsd-comp.c
@@ -46,7 +46,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <net/ppp_defs.h>
 
 #include "ppp-comp.h"
 

diff --git a/pppdump/deflate.c b/pppdump/deflate.c
index 0f090b23463e45758f796f0b2cec75695dd82467..ebc16921fd6ac710778869050306bd6f5b253162 100644 (file)
--- a/pppdump/deflate.c
+++ b/pppdump/deflate.c
@@ -41,7 +41,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <net/ppp_defs.h>
 
 #include "ppp-comp.h"
 #include "zlib.h"

diff --git a/pppdump/ppp-comp.h b/pppdump/ppp-comp.h
index 4046a1f94c992f60320198d0cf0da0fc8de1490f..0199b5fa7b5086166b0997335037296a904bfc1f 100644 (file)
--- a/pppdump/ppp-comp.h
+++ b/pppdump/ppp-comp.h
@@ -51,6 +51,12 @@
 #define DO_PREDICTOR_1 0
 #define DO_PREDICTOR_2 0
 
+#if defined(SOL2)
+#include <net/ppp_defs.h>
+#else
+#include <linux/ppp_defs.h>
+#endif
+
 /*
  * Structure giving methods for compression/decompression.
  */

diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c
index 8944ca5820012589658f435a3b238e598db07d47..2b815fc9b50e41fcd2ec8c0d2a0ad93120a4aaf3 100644 (file)
--- a/pppdump/pppdump.c
+++ b/pppdump/pppdump.c
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <sys/types.h>
-#include <net/ppp_defs.h>
+
 #include "ppp-comp.h"
 
 int hexmode;