small mods for NeXT

diff --git a/include/net/if_ppp.h b/include/net/if_ppp.h
index 17060c74d2f73ae9fbd1b690e4d107cc551c9c38..e414a849d268ccb57517c08a5098dc270337c26c 100644 (file)
--- a/include/net/if_ppp.h
+++ b/include/net/if_ppp.h
@@ -1,4 +1,4 @@
-/*     $Id: if_ppp.h,v 1.16 1997/04/30 05:46:04 paulus Exp $   */
+/*     $Id: if_ppp.h,v 1.17 1998/03/25 04:03:13 paulus Exp $   */
 
 /*
  * if_ppp.h - Point-to-Point Protocol definitions.
@@ -125,7 +125,7 @@ struct ifpppcstatsreq {
 #define ifr_mtu        ifr_ifru.ifru_metric
 #endif
 
-#if defined(_KERNEL) || defined(KERNEL)
+#if (defined(_KERNEL) || defined(KERNEL)) && !defined(NeXT)
 void pppattach __P((void));
 void pppintr __P((void));
 #endif

diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h
index 0857e4e8b89b343ac7c6b0abf255516f8f1e3c88..ae9bbc34cd53884d94882d2ac266d9a9a5db1fd4 100644 (file)
--- a/include/net/ppp_defs.h
+++ b/include/net/ppp_defs.h
@@ -1,4 +1,4 @@
-/*     $Id: ppp_defs.h,v 1.12 1997/11/27 06:05:49 paulus Exp $ */
+/*     $Id: ppp_defs.h,v 1.13 1998/03/25 04:03:14 paulus Exp $ */
 
 /*
  * ppp_defs.h - PPP definitions.
@@ -94,11 +94,14 @@
 /*
  * A 32-bit unsigned integral type.
  */
-#if !defined(__BIT_TYPES_DEFINED__) && !defined(_BITYPES) && !defined(__FreeBSD__)
+
+#if !defined(__BIT_TYPES_DEFINED__) && !defined(_BITYPES) \
+ && !defined(__FreeBSD__) && (NS_TARGET < 40)
 #ifdef UINT32_T
 typedef UINT32_T       u_int32_t;
 #else
 typedef unsigned int   u_int32_t;
+typedef unsigned short  u_int16_t;
 #endif
 #endif