[src/trunk]: src/usr.sbin/pppd/pppstats resolve conflicts

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3880a7622cdc
branches:  trunk
changeset: 475754:3880a7622cdc
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Aug 25 03:00:12 1999 +0000

description:
resolve conflicts

diffstat:

 usr.sbin/pppd/pppstats/pppstats.8 |   4 ++--
 usr.sbin/pppd/pppstats/pppstats.c |  13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r 21cda462cc34 -r 3880a7622cdc usr.sbin/pppd/pppstats/pppstats.8
--- a/usr.sbin/pppd/pppstats/pppstats.8 Wed Aug 25 02:52:15 1999 +0000
+++ b/usr.sbin/pppd/pppstats/pppstats.8 Wed Aug 25 03:00:12 1999 +0000
@@ -1,5 +1,5 @@
-.\"    $NetBSD: pppstats.8,v 1.11 1998/11/22 23:30:29 msaitoh Exp $
-.\"    @(#) Id: pppstats.8,v 1.3 1996/07/01 01:22:35 paulus Exp 
+.\"    $NetBSD: pppstats.8,v 1.12 1999/08/25 03:00:12 christos Exp $
+.\"    @(#) Id: pppstats.8,v 1.3 1996/07/01 01:22:35 paulus Exp
 .TH PPPSTATS 8 "26 June 1995"
 .SH NAME
 pppstats \- print PPP statistics
diff -r 21cda462cc34 -r 3880a7622cdc usr.sbin/pppd/pppstats/pppstats.c
--- a/usr.sbin/pppd/pppstats/pppstats.c Wed Aug 25 02:52:15 1999 +0000
+++ b/usr.sbin/pppd/pppstats/pppstats.c Wed Aug 25 03:00:12 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pppstats.c,v 1.21 1998/09/04 19:13:06 christos Exp $   */
+/*     $NetBSD: pppstats.c,v 1.22 1999/08/25 03:00:12 christos Exp $   */
 
 /*
  * print PPP statistics:
@@ -36,10 +36,12 @@
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
-static char rcsid[] = "Id: pppstats.c,v 1.23 1998/07/07 04:23:04 paulus Exp ";
+static char rcsid[] = "Id: pppstats.c,v 1.27 1999/08/13 06:46:23 paulus Exp ";
 #else
-__RCSID("$NetBSD: pppstats.c,v 1.21 1998/09/04 19:13:06 christos Exp $");
+__RCSID("$NetBSD: pppstats.c,v 1.22 1999/08/25 03:00:12 christos Exp $");
 #endif
+#ifndef __STDC__
+#define const
 #endif
 
 #include <stdio.h>
@@ -56,6 +58,11 @@
 #include <sys/ioctl.h>
 
 #ifndef STREAMS
+#if defined(_linux_) && defined(__powerpc__) \
+    && (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0)
+/* kludge alert! */
+#undef __GLIBC__
+#endif
 #include <sys/socket.h>                /* *BSD, Linux, NeXT, Ultrix etc. */
 #ifndef _linux_
 #include <net/if.h>