From: Paul Mackerras Date: Fri, 13 Aug 1999 06:46:23 +0000 (+0000) Subject: Fix the rcsid's for non-ansi compilers X-Git-Tag: ppp-2.4.7~653 X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=a3630de20e34796f434a728bfd9cf1a961380c82 Fix the rcsid's for non-ansi compilers --- diff --git a/chat/chat.c b/chat/chat.c index 0015e2b..c9e01e2 100644 --- a/chat/chat.c +++ b/chat/chat.c @@ -77,11 +77,14 @@ * Columbus, OH 43221 * (614)451-1883 * - * */ +#ifndef __STDC__ +#define const +#endif + #ifndef lint -static const char rcsid[] = "$Id: chat.c,v 1.23 1999/08/13 01:54:32 paulus Exp $"; +static const char rcsid[] = "$Id: chat.c,v 1.24 1999/08/13 06:46:09 paulus Exp $"; #endif #include diff --git a/pppd/auth.c b/pppd/auth.c index d94d4fb..716d849 100644 --- a/pppd/auth.c +++ b/pppd/auth.c @@ -32,9 +32,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: auth.c,v 1.56 1999/08/12 04:11:20 paulus Exp $"; -#endif +#define RCSID "$Id: auth.c,v 1.57 1999/08/13 06:46:10 paulus Exp $" #include #include @@ -78,6 +76,8 @@ static const char rcsid[] = "$Id: auth.c,v 1.56 1999/08/12 04:11:20 paulus Exp $ #endif #include "pathnames.h" +static const char rcsid[] = RCSID; + /* Bits in scan_authfile return value */ #define NONWILD_SERVER 1 #define NONWILD_CLIENT 2 diff --git a/pppd/cbcp.c b/pppd/cbcp.c index 73cbcf0..6b68228 100644 --- a/pppd/cbcp.c +++ b/pppd/cbcp.c @@ -18,9 +18,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: cbcp.c,v 1.9 1999/08/12 04:25:19 paulus Exp $"; -#endif +#define RCSID "$Id: cbcp.c,v 1.10 1999/08/13 06:46:10 paulus Exp $" #include #include @@ -32,6 +30,8 @@ static const char rcsid[] = "$Id: cbcp.c,v 1.9 1999/08/12 04:25:19 paulus Exp $" #include "fsm.h" #include "lcp.h" +static const char rcsid[] = RCSID; + /* * Options. */ diff --git a/pppd/ccp.c b/pppd/ccp.c index e6b1c12..d6da2d5 100644 --- a/pppd/ccp.c +++ b/pppd/ccp.c @@ -25,9 +25,7 @@ * OR MODIFICATIONS. */ -#ifndef lint -static const char rcsid[] = "$Id: ccp.c,v 1.28 1999/08/12 04:25:19 paulus Exp $"; -#endif +#define RCSID "$Id: ccp.c,v 1.29 1999/08/13 06:46:11 paulus Exp $" #include #include @@ -37,6 +35,8 @@ static const char rcsid[] = "$Id: ccp.c,v 1.28 1999/08/12 04:25:19 paulus Exp $" #include "ccp.h" #include +static const char rcsid[] = RCSID; + /* * Command-line options. */ diff --git a/pppd/chap.c b/pppd/chap.c index a0e821a..b8a5d0f 100644 --- a/pppd/chap.c +++ b/pppd/chap.c @@ -33,9 +33,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: chap.c,v 1.22 1999/08/12 04:25:20 paulus Exp $"; -#endif +#define RCSID "$Id: chap.c,v 1.23 1999/08/13 06:46:11 paulus Exp $" /* * TODO: @@ -53,6 +51,8 @@ static const char rcsid[] = "$Id: chap.c,v 1.22 1999/08/12 04:25:20 paulus Exp $ #include "chap_ms.h" #endif +static const char rcsid[] = RCSID; + /* * Command-line options. */ diff --git a/pppd/chap_ms.c b/pppd/chap_ms.c index 53c1bee..eb0c2c1 100644 --- a/pppd/chap_ms.c +++ b/pppd/chap_ms.c @@ -31,9 +31,7 @@ * You should also use DOMAIN\\USERNAME as described in README.MSCHAP80 */ -#ifndef lint -static const char rcsid[] = "$Id: chap_ms.c,v 1.14 1999/08/12 04:25:20 paulus Exp $"; -#endif +#define RCSID "$Id: chap_ms.c,v 1.15 1999/08/13 06:46:12 paulus Exp $" #ifdef CHAPMS @@ -57,6 +55,8 @@ static const char rcsid[] = "$Id: chap_ms.c,v 1.14 1999/08/12 04:25:20 paulus Ex #include #endif +static const char rcsid[] = RCSID; + typedef struct { u_char LANManResp[24]; u_char NTResp[24]; diff --git a/pppd/demand.c b/pppd/demand.c index 86f286b..bb6538c 100644 --- a/pppd/demand.c +++ b/pppd/demand.c @@ -17,9 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: demand.c,v 1.11 1999/08/12 04:25:20 paulus Exp $"; -#endif +#define RCSID "$Id: demand.c,v 1.12 1999/08/13 06:46:12 paulus Exp $"; #include #include @@ -45,6 +43,8 @@ static const char rcsid[] = "$Id: demand.c,v 1.11 1999/08/12 04:25:20 paulus Exp #include "ipcp.h" #include "lcp.h" +static const char rcsid[] = RCSID; + char *frame; int framelen; int framemax; diff --git a/pppd/eui64.c b/pppd/eui64.c index 6de8e10..dfceeec 100644 --- a/pppd/eui64.c +++ b/pppd/eui64.c @@ -15,14 +15,15 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: eui64.c,v 1.1 1999/08/13 01:58:42 paulus Exp $ + * $Id: eui64.c,v 1.2 1999/08/13 06:46:12 paulus Exp $ */ -#ifndef lint -static char rcsid[] = "$Id: eui64.c,v 1.1 1999/08/13 01:58:42 paulus Exp $"; -#endif + +#define RCSID "$Id: eui64.c,v 1.2 1999/08/13 06:46:12 paulus Exp $" #include "pppd.h" +static const char rcsid[] = RCSID; + /* * eui64_ntoa - Make an ascii representation of an interface identifier */ diff --git a/pppd/fsm.c b/pppd/fsm.c index 02640e7..b5b8148 100644 --- a/pppd/fsm.c +++ b/pppd/fsm.c @@ -17,9 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: fsm.c,v 1.16 1999/08/12 04:25:20 paulus Exp $"; -#endif +#define RCSID "$Id: fsm.c,v 1.17 1999/08/13 06:46:12 paulus Exp $" /* * TODO: @@ -34,6 +32,8 @@ static const char rcsid[] = "$Id: fsm.c,v 1.16 1999/08/12 04:25:20 paulus Exp $" #include "pppd.h" #include "fsm.h" +static const char rcsid[] = RCSID; + static void fsm_timeout __P((void *)); static void fsm_rconfreq __P((fsm *, int, u_char *, int)); static void fsm_rconfack __P((fsm *, int, u_char *, int)); diff --git a/pppd/ipcp.c b/pppd/ipcp.c index 763018b..d3682a0 100644 --- a/pppd/ipcp.c +++ b/pppd/ipcp.c @@ -17,9 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: ipcp.c,v 1.48 1999/08/12 04:25:20 paulus Exp $"; -#endif +#define RCSID "$Id: ipcp.c,v 1.49 1999/08/13 06:46:12 paulus Exp $" /* * TODO: @@ -39,6 +37,8 @@ static const char rcsid[] = "$Id: ipcp.c,v 1.48 1999/08/12 04:25:20 paulus Exp $ #include "ipcp.h" #include "pathnames.h" +static const char rcsid[] = RCSID; + /* global vars */ ipcp_options ipcp_wantoptions[NUM_PPP]; /* Options that we want to request */ ipcp_options ipcp_gotoptions[NUM_PPP]; /* Options that peer ack'd */ diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c index bb7d9a1..94f2f67 100644 --- a/pppd/ipv6cp.c +++ b/pppd/ipv6cp.c @@ -21,16 +21,14 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ipv6cp.c,v 1.1 1999/08/13 01:58:43 paulus Exp $ + * $Id: ipv6cp.c,v 1.2 1999/08/13 06:46:13 paulus Exp $ * * * Original version by Inria (www.inria.fr) * Modified to match RFC2472 by Tommi Komulainen */ -#ifndef lint -static char rcsid[]="$Id: ipv6cp.c,v 1.1 1999/08/13 01:58:43 paulus Exp $"; -#endif +#define RCSID "$Id: ipv6cp.c,v 1.2 1999/08/13 06:46:13 paulus Exp $" /* * TODO: @@ -56,6 +54,8 @@ static char rcsid[]="$Id: ipv6cp.c,v 1.1 1999/08/13 01:58:43 paulus Exp $"; #include "magic.h" #include "pathnames.h" +static const char rcsid[] = RCSID; + /* global vars */ ipv6cp_options ipv6cp_wantoptions[NUM_PPP]; /* Options that we want to request */ ipv6cp_options ipv6cp_gotoptions[NUM_PPP]; /* Options that peer ack'd */ diff --git a/pppd/ipxcp.c b/pppd/ipxcp.c index 2875de9..937dea1 100644 --- a/pppd/ipxcp.c +++ b/pppd/ipxcp.c @@ -18,9 +18,8 @@ */ #ifdef IPX_CHANGE -#ifndef lint -static const char rcsid[] = "$Id: ipxcp.c,v 1.16 1999/08/12 04:25:21 paulus Exp $"; -#endif + +#define RCSID "$Id: ipxcp.c,v 1.17 1999/08/13 06:46:14 paulus Exp $" /* * TODO: @@ -40,6 +39,8 @@ static const char rcsid[] = "$Id: ipxcp.c,v 1.16 1999/08/12 04:25:21 paulus Exp #include "pathnames.h" #include "magic.h" +static const char rcsid[] = RCSID; + /* global vars */ ipxcp_options ipxcp_wantoptions[NUM_PPP]; /* Options that we want to request */ ipxcp_options ipxcp_gotoptions[NUM_PPP]; /* Options that peer ack'd */ diff --git a/pppd/lcp.c b/pppd/lcp.c index d1be64f..95b13b3 100644 --- a/pppd/lcp.c +++ b/pppd/lcp.c @@ -17,9 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: lcp.c,v 1.43 1999/08/12 04:25:21 paulus Exp $"; -#endif +#define RCSID "$Id: lcp.c,v 1.44 1999/08/13 06:46:14 paulus Exp $"; /* * TODO: @@ -35,6 +33,8 @@ static const char rcsid[] = "$Id: lcp.c,v 1.43 1999/08/12 04:25:21 paulus Exp $" #include "chap.h" #include "magic.h" +static const char rcsid[] = RCSID; + /* * LCP-related command-line options. */ diff --git a/pppd/magic.c b/pppd/magic.c index fbb5fce..3c70558 100644 --- a/pppd/magic.c +++ b/pppd/magic.c @@ -17,9 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: magic.c,v 1.8 1999/08/12 04:25:22 paulus Exp $"; -#endif +#define RCSID "$Id: magic.c,v 1.9 1999/08/13 06:46:15 paulus Exp $" #include #include @@ -29,6 +27,8 @@ static const char rcsid[] = "$Id: magic.c,v 1.8 1999/08/12 04:25:22 paulus Exp $ #include "pppd.h" #include "magic.h" +static const char rcsid[] = RCSID; + extern long mrand48 __P((void)); extern void srand48 __P((long)); diff --git a/pppd/main.c b/pppd/main.c index a81e81b..4da0b9a 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -17,9 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: main.c,v 1.82 1999/08/13 01:57:35 paulus Exp $"; -#endif +#define RCSID "$Id: main.c,v 1.83 1999/08/13 06:46:15 paulus Exp $" #include #include @@ -65,6 +63,8 @@ static const char rcsid[] = "$Id: main.c,v 1.82 1999/08/13 01:57:35 paulus Exp $ #include "atcp.h" #endif +static const char rcsid[] = RCSID; + /* interface vars */ char ifname[32]; /* Interface name */ int ifunit; /* Interface unit number */ diff --git a/pppd/options.c b/pppd/options.c index fc65d92..cb9c2d4 100644 --- a/pppd/options.c +++ b/pppd/options.c @@ -17,9 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: options.c,v 1.63 1999/08/13 01:57:36 paulus Exp $"; -#endif +#define RCSID "$Id: options.c,v 1.64 1999/08/13 06:46:16 paulus Exp $" #include #include @@ -57,6 +55,8 @@ static const char rcsid[] = "$Id: options.c,v 1.63 1999/08/13 01:57:36 paulus Ex char *strdup __P((char *)); #endif +static const char rcsid[] = RCSID; + /* * Option variables and default values. */ diff --git a/pppd/sys-NeXT.c b/pppd/sys-NeXT.c index 3a57a2c..8df34e5 100644 --- a/pppd/sys-NeXT.c +++ b/pppd/sys-NeXT.c @@ -19,9 +19,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: sys-NeXT.c,v 1.19 1999/08/12 04:25:22 paulus Exp $"; -#endif +#define RCSID "$Id: sys-NeXT.c,v 1.20 1999/08/13 06:46:17 paulus Exp $" #include #include @@ -58,6 +56,8 @@ static const char rcsid[] = "$Id: sys-NeXT.c,v 1.19 1999/08/12 04:25:22 paulus E #include "pppd.h" +static const char rcsid[] = RCSID; + static int initdisc = -1; /* Initial TTY discipline */ static int initfdflags = -1; /* Initial file descriptor flags for fd */ static int ppp_fd = -1; /* fd which is set to PPP discipline */ diff --git a/pppd/sys-aix4.c b/pppd/sys-aix4.c index 739c310..c244c3e 100644 --- a/pppd/sys-aix4.c +++ b/pppd/sys-aix4.c @@ -20,9 +20,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: sys-aix4.c,v 1.21 1999/08/12 04:25:22 paulus Exp $"; -#endif +#define RCSID "$Id: sys-aix4.c,v 1.22 1999/08/13 06:46:17 paulus Exp $" /* * TODO: @@ -54,6 +52,8 @@ static const char rcsid[] = "$Id: sys-aix4.c,v 1.21 1999/08/12 04:25:22 paulus E #include "pppd.h" +static const char rcsid[] = RCSID; + #ifndef ifr_mtu #define ifr_mtu ifr_metric #endif diff --git a/pppd/sys-bsd.c b/pppd/sys-bsd.c index c28e324..f4a7c1e 100644 --- a/pppd/sys-bsd.c +++ b/pppd/sys-bsd.c @@ -20,8 +20,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: sys-bsd.c,v 1.45 1999/08/12 04:25:23 paulus Exp $"; +#define RCSID "$Id: sys-bsd.c,v 1.46 1999/08/13 06:46:18 paulus Exp $" /* $NetBSD: sys-bsd.c,v 1.1.1.3 1997/09/26 18:53:04 christos Exp $ */ #endif @@ -74,6 +73,8 @@ static const char rcsid[] = "$Id: sys-bsd.c,v 1.45 1999/08/12 04:25:23 paulus Ex #include "fsm.h" #include "ipcp.h" +static const char rcsid[] = RCSID; + static int initdisc = -1; /* Initial TTY discipline for ppp_fd */ static int initfdflags = -1; /* Initial file descriptor flags for ppp_fd */ static int ppp_fd = -1; /* fd which is set to PPP discipline */ diff --git a/pppd/sys-osf.c b/pppd/sys-osf.c index a291a27..920b30a 100644 --- a/pppd/sys-osf.c +++ b/pppd/sys-osf.c @@ -25,9 +25,7 @@ * OR MODIFICATIONS. */ -#ifndef lint -static const char rcsid[] = "$Id: sys-osf.c,v 1.29 1999/08/12 04:25:24 paulus Exp $"; -#endif +#define RCSID "$Id: sys-osf.c,v 1.30 1999/08/13 06:46:18 paulus Exp $" #include #include @@ -61,6 +59,8 @@ static const char rcsid[] = "$Id: sys-osf.c,v 1.29 1999/08/12 04:25:24 paulus Ex #include "pppd.h" +static const char rcsid[] = RCSID; + static int pppfd; static int fdmuxid = -1; static int iffd; diff --git a/pppd/sys-sunos4.c b/pppd/sys-sunos4.c index 551401d..19c233f 100644 --- a/pppd/sys-sunos4.c +++ b/pppd/sys-sunos4.c @@ -25,9 +25,7 @@ * OR MODIFICATIONS. */ -#ifndef lint -static const char rcsid[] = "$Id: sys-sunos4.c,v 1.23 1999/08/12 04:25:24 paulus Exp $"; -#endif +#define RCSID "$Id: sys-sunos4.c,v 1.24 1999/08/13 06:46:19 paulus Exp $" #include #include @@ -67,6 +65,8 @@ extern void *alloca(); #endif #endif /*sparc*/ +static const char rcsid[] = RCSID; + static int pppfd; static int fdmuxid = -1; static int iffd; diff --git a/pppd/sys-svr4.c b/pppd/sys-svr4.c index 236d825..0264318 100644 --- a/pppd/sys-svr4.c +++ b/pppd/sys-svr4.c @@ -25,9 +25,7 @@ * OR MODIFICATIONS. */ -#ifndef lint -static const char rcsid[] = "$Id: sys-svr4.c,v 1.32 1999/08/12 04:24:52 paulus Exp $"; -#endif +#define RCSID "$Id: sys-svr4.c,v 1.33 1999/08/13 06:46:20 paulus Exp $" #include #include @@ -69,6 +67,8 @@ static const char rcsid[] = "$Id: sys-svr4.c,v 1.32 1999/08/12 04:24:52 paulus E #include "pppd.h" +static const char rcsid[] = RCSID; + static int pppfd; static int fdmuxid = -1; static int ipfd; diff --git a/pppd/sys-ultrix.c b/pppd/sys-ultrix.c index 99b5946..009999e 100644 --- a/pppd/sys-ultrix.c +++ b/pppd/sys-ultrix.c @@ -20,9 +20,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: sys-ultrix.c,v 1.32 1999/08/12 04:25:24 paulus Exp $"; -#endif +#define RCSID "$Id: sys-ultrix.c,v 1.33 1999/08/13 06:46:20 paulus Exp $" /* * TODO: @@ -52,6 +50,8 @@ static const char rcsid[] = "$Id: sys-ultrix.c,v 1.32 1999/08/12 04:25:24 paulus #include "pppd.h" +static const char rcsid[] = RCSID; + static int initdisc = -1; /* Initial TTY discipline for ppp_fd */ static int initfdflags = -1; /* Initial file descriptor flags for ppp_fd */ static int ppp_fd = -1; /* fd which is set to PPP discipline */ diff --git a/pppd/upap.c b/pppd/upap.c index 53d4a3c..693c684 100644 --- a/pppd/upap.c +++ b/pppd/upap.c @@ -17,9 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: upap.c,v 1.18 1999/08/12 04:25:25 paulus Exp $"; -#endif +#define RCSID "$Id: upap.c,v 1.19 1999/08/13 06:46:21 paulus Exp $" /* * TODO: @@ -31,6 +29,8 @@ static const char rcsid[] = "$Id: upap.c,v 1.18 1999/08/12 04:25:25 paulus Exp $ #include "pppd.h" #include "upap.h" +static const char rcsid[] = RCSID; + static bool hide_password; /* diff --git a/pppd/utils.c b/pppd/utils.c index 43d0b93..cbab183 100644 --- a/pppd/utils.c +++ b/pppd/utils.c @@ -16,9 +16,8 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: utils.c,v 1.7 1999/08/12 04:25:25 paulus Exp $"; -#endif + +#define RCSID "$Id: utils.c,v 1.8 1999/08/13 06:46:22 paulus Exp $" #include #include @@ -46,6 +45,8 @@ static const char rcsid[] = "$Id: utils.c,v 1.7 1999/08/12 04:25:25 paulus Exp $ #include "pppd.h" +static const char rcsid[] = RCSID; + #if defined(SUNOS4) extern char *strerror(); #endif diff --git a/pppstats/pppstats.c b/pppstats/pppstats.c index 98ca87a..d5f74b9 100644 --- a/pppstats/pppstats.c +++ b/pppstats/pppstats.c @@ -31,8 +31,12 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef __STDC__ +#define const +#endif + #ifndef lint -static const char rcsid[] = "$Id: pppstats.c,v 1.26 1999/08/12 04:25:57 paulus Exp $"; +static const char rcsid[] = "$Id: pppstats.c,v 1.27 1999/08/13 06:46:23 paulus Exp $"; #endif #include