diff options
| author | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-04-27 23:11:09 +0000 |
|---|---|---|
| committer | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-04-27 23:11:09 +0000 |
| commit | a491c935588745154b576226b73833bac78fcb6e (patch) | |
| tree | 973289073fb5d21573a6be2b5cfeba9abd2a9472 /compiler/pdecsub.pas | |
| parent | 38b5e0606069cc5985e995e1da5b6855db67f507 (diff) | |
| parent | ae5b0de491a91321675f73eae5db628d068f4e05 (diff) | |
| download | fpc-a491c935588745154b576226b73833bac78fcb6e.tar.gz | |
* synchronized with trunkunicodekvm
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/unicodekvm@49282 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/pdecsub.pas')
| -rw-r--r-- | compiler/pdecsub.pas | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/pdecsub.pas b/compiler/pdecsub.pas index b7ce1fda75..5dcb4ad8a7 100644 --- a/compiler/pdecsub.pas +++ b/compiler/pdecsub.pas @@ -1959,7 +1959,8 @@ var pt : tnode; {$endif WITHDMT} begin - if (not assigned(pd.owner.defowner) or + if assigned(pd.owner) and + (not assigned(pd.owner.defowner) or not is_java_class_or_interface(tdef(pd.owner.defowner))) and (po_external in pd.procoptions) then Message2(parser_e_proc_dir_conflict,'EXTERNAL','"VIRTUAL"'); |