From c693a91e18dd85a7e8eaf294398bd49a14bc60a7 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sun, 27 Oct 2013 17:35:04 +0000 Subject: [PATCH] * fixed compilation after r25847 (mantis #25237) git-svn-id: trunk@25870 - --- compiler/jvm/njvmcnv.pas | 2 +- compiler/jvm/njvmflw.pas | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/jvm/njvmcnv.pas b/compiler/jvm/njvmcnv.pas index a4a09a200f..0721ba7489 100644 --- a/compiler/jvm/njvmcnv.pas +++ b/compiler/jvm/njvmcnv.pas @@ -1083,7 +1083,7 @@ implementation but do not allow records to be directly typecasted into class/ pointer types (you have to use FpcBaseRecordType(@rec) instead) } if not is_record(fromdef) and - is_related(fromdef,todef) then + def_is_related(fromdef,todef) then exit; if check_type_equality(fromdef,todef) then exit; diff --git a/compiler/jvm/njvmflw.pas b/compiler/jvm/njvmflw.pas index db86f059f9..966a57a23d 100644 --- a/compiler/jvm/njvmflw.pas +++ b/compiler/jvm/njvmflw.pas @@ -55,7 +55,7 @@ implementation uses verbose,globals,systems,globtype,constexp, - symconst,symdef,symsym,aasmtai,aasmdata,aasmcpu,defutil,jvmdef, + symconst,symdef,symsym,aasmtai,aasmdata,aasmcpu,defutil,jvmdef,defcmp, procinfo,cgbase,pass_1,pass_2,parabase, cpubase,cpuinfo, nbas,nld,ncon,ncnv,