X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=include%2Fnet%2Fppp_defs.h;h=bda882ea1a285d09a8ebc5b23d12ed18b0a59e7c;hp=0857e4e8b89b343ac7c6b0abf255516f8f1e3c88;hb=7bb8beb860037a6c18dd0b64b8d542a20aa2c8c0;hpb=96dad36e1d37716004171559280613739e7df29e diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h index 0857e4e..bda882e 100644 --- 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.15 2002/05/21 17:26:48 dfs Exp $ */ /* * ppp_defs.h - PPP definitions. @@ -77,7 +77,9 @@ #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_ECP 0x8053 /* Encryption Control Protocol */ #define PPP_LCP 0xc021 /* Link Control Protocol */ #define PPP_PAP 0xc023 /* Password Authentication Protocol */ #define PPP_LQR 0xc025 /* Link Quality Report protocol */ @@ -94,11 +96,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