diff options
| author | wsanchez <wsanchez@NetBSD.org> | 1998-10-08 01:29:27 +0000 |
|---|---|---|
| committer | wsanchez <wsanchez@NetBSD.org> | 1998-10-08 01:29:27 +0000 |
| commit | d2b96d3f77535a6b4b68bc7204cb724a50a1b452 (patch) | |
| tree | 80ab8b69858c75423182054541abf53c7815bb81 /usr.bin/error | |
| parent | 974aa74abd2e7fca95e0253a90f67af72bc8d622 (diff) | |
Get rid of multiply defined common symbols
langauge should be language in error.h
Diffstat (limited to 'usr.bin/error')
| -rw-r--r-- | usr.bin/error/error.h | 16 | ||||
| -rw-r--r-- | usr.bin/error/input.c | 7 | ||||
| -rw-r--r-- | usr.bin/error/main.c | 11 | ||||
| -rw-r--r-- | usr.bin/error/pi.c | 6 |
4 files changed, 22 insertions, 18 deletions
diff --git a/usr.bin/error/error.h b/usr.bin/error/error.h index cf0ce6902ef..6fe1431c42c 100644 --- a/usr.bin/error/error.h +++ b/usr.bin/error/error.h @@ -1,4 +1,4 @@ -/* $NetBSD: error.h,v 1.4 1997/10/18 14:44:25 lukem Exp $ */ +/* $NetBSD: error.h,v 1.5 1998/10/08 01:29:27 wsanchez Exp $ */ /* * Copyright (c) 1980, 1993 @@ -110,8 +110,8 @@ extern int class_count[]; #define TOTHEFILE 1 /* touch the file */ #define TOSTDOUT 2 /* just print them out (ho-hum) */ -FILE *errorfile; /* where error file comes from */ -FILE *queryfile; /* where the query responses from the user come from*/ +extern FILE *errorfile; /* where error file comes from */ +extern FILE *queryfile; /* where the query responses from the user come from*/ extern char *currentfilename; extern char *processname; @@ -170,8 +170,8 @@ extern struct lang_desc lang_table[]; */ #define ERRORNAME "/.errorrc" -int nignored; -char **names_ignored; +extern int nignored; +extern char **names_ignored; /* * Structure definition for a full error */ @@ -200,13 +200,13 @@ extern Eptr *errors; */ extern int nfiles; extern Eptr **files; /* array of pointers into errors*/ -boolean *touchedfiles; /* which files we touched */ +extern boolean *touchedfiles; /* which files we touched */ /* - * The langauge the compilation is in, as intuited from + * The language the compilation is in, as intuited from * the flavor of error messages analyzed. */ -extern int langauge; +extern int language; extern char *currentfilename; /* diff --git a/usr.bin/error/input.c b/usr.bin/error/input.c index d226510d0d0..eebda9b7322 100644 --- a/usr.bin/error/input.c +++ b/usr.bin/error/input.c @@ -1,4 +1,4 @@ -/* $NetBSD: input.c,v 1.5 1997/10/18 14:44:32 lukem Exp $ */ +/* $NetBSD: input.c,v 1.6 1998/10/08 01:29:27 wsanchez Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: input.c,v 1.5 1997/10/18 14:44:32 lukem Exp $"); +__RCSID("$NetBSD: input.c,v 1.6 1998/10/08 01:29:27 wsanchez Exp $"); #endif /* not lint */ #include <stdio.h> @@ -50,9 +50,6 @@ __RCSID("$NetBSD: input.c,v 1.5 1997/10/18 14:44:32 lukem Exp $"); int wordc; /* how long the current error message is */ char **wordv; /* the actual error message */ -int nerrors; -int language; - Errorclass catchall __P((void)); Errorclass cpp __P((void)); Errorclass f77 __P((void)); diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c index d5702f3abda..53742322f31 100644 --- a/usr.bin/error/main.c +++ b/usr.bin/error/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.4 1997/10/18 14:44:35 lukem Exp $ */ +/* $NetBSD: main.c,v 1.5 1998/10/08 01:29:28 wsanchez Exp $ */ /* * Copyright (c) 1980, 1993 @@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: main.c,v 1.4 1997/10/18 14:44:35 lukem Exp $"); +__RCSID("$NetBSD: main.c,v 1.5 1998/10/08 01:29:28 wsanchez Exp $"); #endif /* not lint */ #include <signal.h> @@ -55,12 +55,19 @@ __RCSID("$NetBSD: main.c,v 1.4 1997/10/18 14:44:35 lukem Exp $"); #include "error.h" #include "pathnames.h" +FILE *errorfile; /* where error file comes from */ +FILE *queryfile; /* where the query responses from the user come from*/ + +int nignored; +char **names_ignored; + int nerrors = 0; Eptr er_head; Eptr *errors; int nfiles = 0; Eptr **files; /* array of pointers into errors*/ +boolean *touchedfiles; /* which files we touched */ int language = INCC; char *currentfilename = "????"; diff --git a/usr.bin/error/pi.c b/usr.bin/error/pi.c index f8269f19499..eccfc7dd9ea 100644 --- a/usr.bin/error/pi.c +++ b/usr.bin/error/pi.c @@ -1,4 +1,4 @@ -/* $NetBSD: pi.c,v 1.4 1997/10/18 14:44:37 lukem Exp $ */ +/* $NetBSD: pi.c,v 1.5 1998/10/08 01:29:28 wsanchez Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pi.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: pi.c,v 1.4 1997/10/18 14:44:37 lukem Exp $"); +__RCSID("$NetBSD: pi.c,v 1.5 1998/10/08 01:29:28 wsanchez Exp $"); #endif /* not lint */ #include <stdio.h> @@ -248,7 +248,7 @@ pi() * Where the | is intended to be a down arrow, so that * the pi error messages can be inserted above the * line in error, instead of below. (All of the other - * langauges put thier messages before the source line, + * languages put thier messages before the source line, * instead of after it as does pi.) * * where the pointer to the error has been truncated |
