Date: Sat, 11 Feb 2017 21:28:03 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433916 - head/java/jlint/files Message-ID: <201702112128.v1BLS3mq079390@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Feb 11 21:28:03 2017 New Revision: 433916 URL: https://svnweb.freebsd.org/changeset/ports/433916 Log: Actually add the patch Reported by: antoine Added: head/java/jlint/files/patch-jlint.cc (contents, props changed) head/java/jlint/files/patch-method__desc.cc (contents, props changed) head/java/jlint/files/patch-method__desc.hh (contents, props changed) Added: head/java/jlint/files/patch-jlint.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/jlint/files/patch-jlint.cc Sat Feb 11 21:28:03 2017 (r433916) @@ -0,0 +1,31 @@ +--- jlint.cc.orig 2011-01-11 02:42:33 UTC ++++ jlint.cc +@@ -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* jlint_is_const; + + message_descriptor msg_table[] = + { +@@ -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. jlint_is_const ++ field_desc* jlint_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 jlint_is_const; + + monitor_stack::const_iterator it; + for (it = this_class->usedLocks.begin(); Added: head/java/jlint/files/patch-method__desc.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/jlint/files/patch-method__desc.cc Sat Feb 11 21:28:03 2017 (r433916) @@ -0,0 +1,20 @@ +--- method_desc.cc.orig 2003-06-09 09:29:14 UTC ++++ method_desc.cc +@@ -767,7 +767,7 @@ void method_desc::parse_code(constant** + sp->mask = var_desc::vs_not_null; + } + sp->index = NO_ASSOC_VAR; +- sp->equals = is_const; ++ sp->equals = jlint_is_const; + sp += 1; + } + break; +@@ -2381,7 +2381,7 @@ void method_desc::parse_code(constant** + aux->name_and_type = nt; + sp->equals = aux; + equal_descs.push_back(aux);*/ +- sp->equals = is_const; ++ sp->equals = jlint_is_const; + } + } + field->equals = sp->equals; Added: head/java/jlint/files/patch-method__desc.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/jlint/files/patch-method__desc.hh Sat Feb 11 21:28:03 2017 (r433916) @@ -0,0 +1,9 @@ +--- method_desc.hh.orig 2001-02-09 23:40:33 UTC ++++ method_desc.hh +@@ -147,5 +147,5 @@ 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* jlint_is_const; + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702112128.v1BLS3mq079390>