Module Name: src
Committed By: ryo
Date: Mon Oct 25 07:40:30 UTC 2021
Modified Files:
src/sys/dev/microcode/aic7xxx: aicasm_gram.y aicasm_symbol.h
Log Message:
fix build failure of "multiple definition"
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/microcode/aic7xxx/aicasm_gram.y
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/microcode/aic7xxx/aicasm_symbol.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/microcode/aic7xxx/aicasm_gram.y
diff -u src/sys/dev/microcode/aic7xxx/aicasm_gram.y:1.8 src/sys/dev/microcode/aic7xxx/aicasm_gram.y:1.9
--- src/sys/dev/microcode/aic7xxx/aicasm_gram.y:1.8 Sun Sep 19 10:34:09 2021
+++ src/sys/dev/microcode/aic7xxx/aicasm_gram.y Mon Oct 25 07:40:29 2021
@@ -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;
Index: src/sys/dev/microcode/aic7xxx/aicasm_symbol.h
diff -u src/sys/dev/microcode/aic7xxx/aicasm_symbol.h:1.2 src/sys/dev/microcode/aic7xxx/aicasm_symbol.h:1.3
--- src/sys/dev/microcode/aic7xxx/aicasm_symbol.h:1.2 Sat Apr 19 19:26:11 2003
+++ src/sys/dev/microcode/aic7xxx/aicasm_symbol.h Mon Oct 25 07:40:29 2021
@@ -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 @@ struct macro_arg {
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;
