java/jlint: Unbreak on CURRENT
In file included from access_desc.cc:1: In file included from ./access_desc.hh:8: In file included from ./class_desc.hh:4: In file included from ./types.hh:41: ./jlint.d:117:16: error: redefinition of 'drem' JAVA_INSN(115, drem, 1) ^ /usr/include/math.h:329:8: note: previous definition is here double drem(double, double); ^
This commit is contained in:
parent
0ee529beaf
commit
2162d07aed
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=528899
2 changed files with 22 additions and 2 deletions
11
java/jlint/files/patch-jlint.d
Normal file
11
java/jlint/files/patch-jlint.d
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- jlint.d.orig 2020-03-22 06:04:53 UTC
|
||||
+++ jlint.d
|
||||
@@ -114,7 +114,7 @@ JAVA_INSN(111, ddiv, 1)
|
||||
JAVA_INSN(112, irem, 1)
|
||||
JAVA_INSN(113, lrem, 1)
|
||||
JAVA_INSN(114, frem, 1)
|
||||
-JAVA_INSN(115, drem, 1)
|
||||
+JAVA_INSN(115, Jdrem, 1)
|
||||
JAVA_INSN(116, ineg, 1)
|
||||
JAVA_INSN(117, lneg, 1)
|
||||
JAVA_INSN(118, fneg, 1)
|
|
@ -1,6 +1,6 @@
|
|||
--- method_desc.cc.orig 2003-06-09 09:29:14 UTC
|
||||
+++ method_desc.cc
|
||||
@@ -767,7 +767,7 @@ void method_desc::parse_code(constant**
|
||||
@@ -767,7 +767,7 @@ void method_desc::parse_code(constant** constant_pool,
|
||||
sp->mask = var_desc::vs_not_null;
|
||||
}
|
||||
sp->index = NO_ASSOC_VAR;
|
||||
|
@ -9,7 +9,16 @@
|
|||
sp += 1;
|
||||
}
|
||||
break;
|
||||
@@ -2381,7 +2381,7 @@ void method_desc::parse_code(constant**
|
||||
@@ -1906,7 +1906,7 @@ void method_desc::parse_code(constant** constant_pool,
|
||||
case dsub:
|
||||
case dmul:
|
||||
case ddiv:
|
||||
- case drem:
|
||||
+ case Jdrem:
|
||||
sp -= 2;
|
||||
break;
|
||||
case ineg:
|
||||
@@ -2381,7 +2381,7 @@ void method_desc::parse_code(constant** constant_pool,
|
||||
aux->name_and_type = nt;
|
||||
sp->equals = aux;
|
||||
equal_descs.push_back(aux);*/
|
||||
|
|
Loading…
Reference in a new issue