svn commit: r528899 - head/java/jlint/files
Tobias Kortkamp
tobik at FreeBSD.org
Sun Mar 22 06:08:33 UTC 2020
Author: tobik
Date: Sun Mar 22 06:08:32 2020
New Revision: 528899
URL: https://svnweb.freebsd.org/changeset/ports/528899
Log:
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);
^
Added:
head/java/jlint/files/patch-jlint.d (contents, props changed)
Modified:
head/java/jlint/files/patch-method__desc.cc
Added: head/java/jlint/files/patch-jlint.d
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/jlint/files/patch-jlint.d Sun Mar 22 06:08:32 2020 (r528899)
@@ -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)
Modified: head/java/jlint/files/patch-method__desc.cc
==============================================================================
--- head/java/jlint/files/patch-method__desc.cc Sun Mar 22 05:50:30 2020 (r528898)
+++ head/java/jlint/files/patch-method__desc.cc Sun Mar 22 06:08:32 2020 (r528899)
@@ -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);*/
More information about the svn-ports-all
mailing list