Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/microcode/aic7xxx fix build failure of "multiple def...



details:   https://anonhg.NetBSD.org/src/rev/e4da6bdae4ee
branches:  trunk
changeset: 990059:e4da6bdae4ee
user:      ryo <ryo%NetBSD.org@localhost>
date:      Mon Oct 25 07:40:29 2021 +0000

description:
fix build failure of "multiple definition"

diffstat:

 sys/dev/microcode/aic7xxx/aicasm_gram.y   |  3 +--
 sys/dev/microcode/aic7xxx/aicasm_symbol.h |  4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 37f1b64012b0 -r e4da6bdae4ee sys/dev/microcode/aic7xxx/aicasm_gram.y
--- a/sys/dev/microcode/aic7xxx/aicasm_gram.y   Mon Oct 25 06:25:18 2021 +0000
+++ b/sys/dev/microcode/aic7xxx/aicasm_gram.y   Mon Oct 25 07:40:29 2021 +0000
@@ -1,5 +1,5 @@
 %{
-/*     $NetBSD: aicasm_gram.y,v 1.8 2021/09/19 10:34:09 andvar Exp $   */
+/*     $NetBSD: aicasm_gram.y,v 1.9 2021/10/25 07:40:29 ryo Exp $      */
 
 /*
  * Parser for the Aic7xxx SCSI Host adapter sequencer assembler.
@@ -62,7 +62,6 @@
 #include "aicasm_symbol.h"
 #include "aicasm_insformat.h"
 
-int yylineno;
 char *yyfilename;
 char stock_prefix[] = "aic_";
 char *prefix = stock_prefix;
diff -r 37f1b64012b0 -r e4da6bdae4ee sys/dev/microcode/aic7xxx/aicasm_symbol.h
--- a/sys/dev/microcode/aic7xxx/aicasm_symbol.h Mon Oct 25 06:25:18 2021 +0000
+++ b/sys/dev/microcode/aic7xxx/aicasm_symbol.h Mon Oct 25 07:40:29 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aicasm_symbol.h,v 1.2 2003/04/19 19:26:11 fvdl Exp $   */
+/*     $NetBSD: aicasm_symbol.h,v 1.3 2021/10/25 07:40:29 ryo Exp $    */
 
 /*
  * Aic7xxx SCSI host adapter firmware asssembler symbol table definitions
@@ -112,7 +112,7 @@
        regex_t arg_regex;
        char   *replacement_text;
 };
-STAILQ_HEAD(macro_arg_list, macro_arg) args;
+STAILQ_HEAD(macro_arg_list, macro_arg);
 
 struct macro_info {
        struct macro_arg_list args;



Home | Main Index | Thread Index | Old Index