cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak on clang. ok sthen@

Browse Source
This commit is contained in:
ian 2017-04-14 00:44:21 +00:00
parent 7948e67b80
commit fde3cff987
3 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
java/jlint/patches/patch-jlint_cc
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-jlint_cc,v 1.4 2015/06/17 19:06:58 jasper Exp $
--- jlint.cc.orig Tue Jan 11 03:42:33 2011
+++ jlint.cc Wed Jun 17 21:04:30 2015
$OpenBSD: patch-jlint_cc,v 1.5 2017/04/14 00:44:21 ian Exp $
--- jlint.cc.orig Mon Jan 10 21:42:33 2011
+++ jlint.cc Wed Apr 12 14:39:37 2017
@@ -41,7 +41,7 @@ bool source_path_redefined = false;
int reported_message_mask = cat_all;
FILE* history;
string_pool stringPool;
-field_desc* is_const;
+field_desc* my_is_const;
message_descriptor msg_table[] =
{
@@ -138,7 +138,7 @@ int get_type(utf_string const& str)
void format_message(int code, utf_string const& file, int line, __VALIST ap)
@ -37,3 +46,23 @@ $OpenBSD: patch-jlint_cc,v 1.4 2015/06/17 19:06:58 jasper Exp $
}
} else if (!message_node::find(his_buf)) {
fprintf(stdout, "%s\n", msg_buf);
@@ -401,8 +401,8 @@ bool parse_class_file(byte* fp)
is_this->equals = is_this;
is_this->cls = this_class;
- // init. is_const
- field_desc* is_const = new field_desc(utf_string("<const>"), NULL, NULL);
+ // init. my_is_const
+ field_desc* my_is_const = new field_desc(utf_string("<const>"), NULL, NULL);
this_class->attr = access_flags;
if (super_class_name == 0) { // Object class
@@ -627,7 +627,7 @@ bool parse_class_file(byte* fp)
delete[] constant_pool;
delete is_this->name_and_type;
//delete is_this;
- delete is_const;
+ delete my_is_const;
monitor_stack::const_iterator it;
for (it = this_class->usedLocks.begin();

21
java/jlint/patches/patch-method_desc_cc Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-method_desc_cc,v 1.1 2017/04/14 00:44:21 ian Exp $
--- method_desc.cc.orig Wed Apr 12 14:38:53 2017
+++ method_desc.cc Wed Apr 12 14:40:13 2017
@@ -767,7 +767,7 @@ void method_desc::parse_code(constant** constant_pool,
sp->mask = var_desc::vs_not_null;
}
sp->index = NO_ASSOC_VAR;
- sp->equals = is_const;
+ sp->equals = my_is_const;
sp += 1;
}
break;
@@ -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);*/
- sp->equals = is_const;
+ sp->equals = my_is_const;
}
}
field->equals = sp->equals;

10
java/jlint/patches/patch-method_desc_hh Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-method_desc_hh,v 1.1 2017/04/14 00:44:21 ian Exp $
--- method_desc.hh.orig Wed Apr 12 14:38:59 2017
+++ method_desc.hh Wed Apr 12 14:39:50 2017
@@ -147,5 +147,5 @@ class method_desc : public component_desc { (private)
const char* compound_name(const char* first, const char* second);
extern string_pool stringPool; // declared in jlint.cc
-extern field_desc* is_const;
+extern field_desc* my_is_const;
#endif