X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=NeXT%2Fif_pppvar.h;h=f3bf00438b202944350f27c4e417af0c6e551e7f;hb=33ec2ebb02d53e28f1b20c46652b882b34732ae4;hp=49a1fc7d551755c7af01dc26a26af98844e7d43c;hpb=7554d5fef3f478ca0f9c8911522d7c1783989eae;p=ppp.git

diff --git a/NeXT/if_pppvar.h b/NeXT/if_pppvar.h
index 49a1fc7..f3bf004 100644
--- a/NeXT/if_pppvar.h
+++ b/NeXT/if_pppvar.h
@@ -20,7 +20,9 @@
 /* Portions Copyright (C) 1990 Brad K. Clements (streams support)
  */
 
+#if !(NS_TARGET >= 40)
 #import <kernserv/prototypes.h>
+#endif /* NS_TARGET */
 
 /*
  * Supported network protocols.  These values are used for
@@ -33,8 +35,7 @@
 
 
 /* only defined in the posix universe... */
-typedef	int pid_t;
-typedef unsigned short u_int16_t;
+/*typedef	int pid_t; */
 
 struct ppp_softc {
 	netif_t	sc_if;		/* network-visible interface */
@@ -45,7 +46,7 @@ struct ppp_softc {
 	void	(*sc_relinq) __P((struct ppp_softc *));	/* relinquish ifunit */
 	u_int16_t sc_mru;	/* max receive unit */
 	pid_t	sc_xfer;	/* used in transferring unit */
-	netbuf_t sc_m;		/* Current TTY input netbuf */
+	NETBUF_T sc_m;		/* Current TTY input netbuf */
 	struct nb_queue sc_freeq; /* reserve netbufs */
 	struct nb_queue sc_rawq;  /* Raw input buffers */
 	struct nb_queue sc_fastq; /* For telnet, rlogin, and ftp control */
@@ -58,10 +59,6 @@ struct ppp_softc {
 #endif
 	u_int	sc_bytessent;	/* count of octets sent */
 	u_int	sc_bytesrcvd;	/* count of octets received */
-#if NBPFILTER
-	caddr_t	sc_bpf;		/* hook for BPF */
-	int if_pcount;          /* Really belongs in ifnet_t */
-#endif
 	enum NPmode sc_npmode[NUM_NP]; /* what to do with each NP */
 #ifdef	PPP_COMPRESS
 	struct compressor *sc_xcomp; /* transmit compressor */
@@ -78,7 +75,7 @@ struct ppp_softc {
 	/* Device-dependent part for async lines. */
 	ext_accm sc_asyncmap;	/* async control character map */
 	u_int32_t sc_rasyncmap;	/* receive async control char map */
-	netbuf_t sc_outm;	/* netbuf currently being output */
+	NETBUF_T sc_outm;	/* netbuf currently being output */
 	char	*sc_mp;		/* ptr to next char in input netbuf */
 	u_int16_t sc_ilen;      /* length of input packet so far */
 	u_int16_t sc_fcs;	/* FCS so far (input) */
@@ -92,8 +89,8 @@ extern struct	ppp_softc ppp_softc[];
 struct	ppp_softc *pppalloc __P((pid_t pid));
 void	pppdealloc __P((struct ppp_softc *sc));
 int	pppioctl __P((struct ppp_softc *sc, u_long cmd, void *data, int flag));
-void	ppppktin __P((struct ppp_softc *sc, netbuf_t m, int lost));
-netbuf_t ppp_dequeue __P((struct ppp_softc *sc));
+void	ppppktin __P((struct ppp_softc *sc, NETBUF_T m, int lost));
+NETBUF_T ppp_dequeue __P((struct ppp_softc *sc));
 
 #define t_sc T_LINEP