X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=include%2Fnet%2Fppp_defs.h;h=4152b069a7061c70af2c7c8ae16b2d9908a776c1;hb=dd98145afae71e5b436fdf8a989651d727d8cf31;hp=d1383f3351b81b8e2d5061401d646a2d85ba763a;hpb=d7c1b0394cf9260b5ff6319bfbe055ea7fc70d23;p=ppp.git diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h index d1383f3..4152b06 100644 --- a/include/net/ppp_defs.h +++ b/include/net/ppp_defs.h @@ -1,4 +1,4 @@ -/* $Id: ppp_defs.h,v 1.11 1997/04/30 05:46:24 paulus Exp $ */ +/* $Id: ppp_defs.h,v 1.14 1999/08/13 01:55:40 paulus Exp $ */ /* * ppp_defs.h - PPP definitions. @@ -69,11 +69,15 @@ */ #define PPP_IP 0x21 /* Internet Protocol */ #define PPP_AT 0x29 /* AppleTalk Protocol */ +#define PPP_IPX 0x2b /* IPX protocol */ #define PPP_VJC_COMP 0x2d /* VJ compressed TCP */ #define PPP_VJC_UNCOMP 0x2f /* VJ uncompressed TCP */ +#define PPP_IPV6 0x57 /* Internet Protocol Version 6 */ #define PPP_COMP 0xfd /* compressed packet */ #define PPP_IPCP 0x8021 /* IP Control Protocol */ #define PPP_ATCP 0x8029 /* AppleTalk Control Protocol */ +#define PPP_IPXCP 0x802b /* IPX Control Protocol */ +#define PPP_IPV6CP 0x8057 /* IPv6 Control Protocol */ #define PPP_CCP 0x80fd /* Compression Control Protocol */ #define PPP_LCP 0xc021 /* Link Control Protocol */ #define PPP_PAP 0xc023 /* Password Authentication Protocol */ @@ -91,11 +95,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