Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts

This commit is contained in:
christos 1998-05-02 14:31:10 +00:00
parent 30402427a8
commit 1e38977381
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.sbin/pppd/pppstats/pppstats.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pppstats.c,v 1.17 1997/09/26 19:53:32 christos Exp $ */
/* $NetBSD: pppstats.c,v 1.18 1998/05/02 14:31:10 christos Exp $ */
/*
* print PPP statistics:
@ -36,9 +36,9 @@
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char rcsid[] = "Id: pppstats.c,v 1.19 1997/04/30 06:00:27 paulus Exp ";
static char rcsid[] = "Id: pppstats.c,v 1.22 1998/03/31 23:48:03 paulus Exp ";
#else
__RCSID("$NetBSD: pppstats.c,v 1.17 1997/09/26 19:53:32 christos Exp $");
__RCSID("$NetBSD: pppstats.c,v 1.18 1998/05/02 14:31:10 christos Exp $");
#endif
#endif
@ -54,19 +54,28 @@ __RCSID("$NetBSD: pppstats.c,v 1.17 1997/09/26 19:53:32 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <net/ppp_defs.h>
#ifndef STREAMS
#include <sys/socket.h> /* *BSD, Linux, NeXT, Ultrix etc. */
#include <net/if.h>
#ifndef _linux_
#include <net/if.h>
#include <net/ppp_defs.h>
#include <net/if_ppp.h>
#else
#include <net/if_ppp.h>
/* Linux */
#if __GLIBC__ >= 2
#include <net/if.h>
#else
#include <linux/if.h>
#endif
#include <linux/types.h>
#include <linux/ppp_defs.h>
#include <linux/if_ppp.h>
#endif /* _linux_ */
#else /* STREAMS */
#include <sys/stropts.h> /* SVR4, Solaris 2, SunOS 4, OSF/1, etc. */
#include <net/ppp_defs.h>
#include <net/pppio.h>
#endif /* STREAMS */