Fix it so it compiles with glibc 2 under linux

[ppp.git] / pppstats / pppstats.c

diff --git a/pppstats/pppstats.c b/pppstats/pppstats.c
index 3388f7978a12acbf841c28a7ccad1bc802c1ada5..36e1ed60dd6c7f42af3003f52496f36cdf786ee2 100644 (file)
--- a/pppstats/pppstats.c
+++ b/pppstats/pppstats.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char rcsid[] = "$Id: pppstats.c,v 1.16 1996/09/14 05:13:25 paulus Exp $";
+static char rcsid[] = "$Id: pppstats.c,v 1.22 1998/03/31 23:48:03 paulus Exp $";

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -47,15 +47,28 @@ static char rcsid[] = "$Id: pppstats.c,v 1.16 1996/09/14 05:13:25 paulus Exp $";
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #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. */
 
 #ifndef STREAMS
 #include <sys/socket.h>                /* *BSD, Linux, NeXT, Ultrix etc. */

+#ifndef _linux_

 #include <net/if.h>
 #include <net/if.h>

+#include <net/ppp_defs.h>

 #include <net/if_ppp.h>
 #include <net/if_ppp.h>

+#else
+/* 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. */
 
 #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 */
 #include <net/pppio.h>
 
 #endif /* STREAMS */


@@ -71,12 +84,20 @@ int signalled;              /* set if alarm goes off "early" */
 char   *progname;
 char   *interface;
 
 char   *progname;
 char   *interface;
 

-#if defined(SUNOS4)
+#if defined(SUNOS4) || defined(ULTRIX) || defined(NeXT)

 extern int optind;
 extern char *optarg;
 #endif
 
 extern int optind;
 extern char *optarg;
 #endif
 

-void
+static void usage __P((void));
+static void catchalarm __P((int));
+static void get_ppp_stats __P((struct ppp_stats *));
+static void get_ppp_cstats __P((struct ppp_comp_stats *));
+static void intpr __P((void));
+
+int main __P((int, char *argv[]));
+
+static void

 usage()
 {
     fprintf(stderr, "Usage: %s [-a|-d] [-v|-r|-z] [-c count] [-w wait] [interface]\n",
 usage()
 {
     fprintf(stderr, "Usage: %s [-a|-d] [-v|-r|-z] [-c count] [-w wait] [interface]\n",


@@ -88,7 +109,7 @@ usage()
  * Called if an interval expires before intpr has completed a loop.
  * Sets a flag to not wait for the alarm.
  */
  * Called if an interval expires before intpr has completed a loop.
  * Sets a flag to not wait for the alarm.
  */

-void
+static void

 catchalarm(arg)
     int arg;
 {
 catchalarm(arg)
     int arg;
 {


@@ -97,7 +118,7 @@ catchalarm(arg)
 
 
 #ifndef STREAMS
 
 
 #ifndef STREAMS

-void
+static void

 get_ppp_stats(curp)
     struct ppp_stats *curp;
 {
 get_ppp_stats(curp)
     struct ppp_stats *curp;
 {


@@ -123,7 +144,7 @@ get_ppp_stats(curp)
     *curp = req.stats;
 }
 
     *curp = req.stats;
 }
 

-void
+static void

 get_ppp_cstats(csp)
     struct ppp_comp_stats *csp;
 {
 get_ppp_cstats(csp)
     struct ppp_comp_stats *csp;
 {


@@ -189,7 +210,7 @@ strioctl(fd, cmd, ptr, ilen, olen)
     return 0;
 }
 
     return 0;
 }
 

-void
+static void

 get_ppp_stats(curp)
     struct ppp_stats *curp;
 {
 get_ppp_stats(curp)
     struct ppp_stats *curp;
 {


@@ -203,7 +224,7 @@ get_ppp_stats(curp)
     }
 }
 
     }
 }
 

-void
+static void

 get_ppp_cstats(csp)
     struct ppp_comp_stats *csp;
 {
 get_ppp_cstats(csp)
     struct ppp_comp_stats *csp;
 {


@@ -238,7 +259,7 @@ get_ppp_cstats(csp)
  * collected over that interval.  Assumes that interval is non-zero.
  * First line printed is cumulative.
  */
  * collected over that interval.  Assumes that interval is non-zero.
  * First line printed is cumulative.
  */

-void
+static void

 intpr()
 {
     register int line = 0;
 intpr()
 {
     register int line = 0;


@@ -348,7 +369,6 @@ intpr()
            else
                printf("  | %8u", V(p.ppp_obytes));
            printf(" %6u %6u",
            else
                printf("  | %8u", V(p.ppp_obytes));
            printf(" %6u %6u",

-                  V(p.ppp_obytes),

                   V(p.ppp_opackets),
                   V(vj.vjs_compressed));
            if (!rflag)
                   V(p.ppp_opackets),
                   V(vj.vjs_compressed));
            if (!rflag)