X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Foberon-type-compat.c;h=ab5419d7d444c39fc645df0c04704756cb0678fd;hp=a30849986c45fa9d2054587864c280b9e7a5cc23;hb=HEAD;hpb=ab13caca4af9fb7617a6dfeaaec3b250c5bda0ac diff --git a/src/oberon-type-compat.c b/src/oberon-type-compat.c index a308499..ab5419d 100644 --- a/src/oberon-type-compat.c +++ b/src/oberon-type-compat.c @@ -7,11 +7,9 @@ #include #include -#include "../include/oberon.h" - -#include "oberon-common.h" #include "oberon-internals.h" #include "oberon-type-compat.h" +#include "oberon-common.h" bool oberon_is_array_type(oberon_type_t * t) @@ -476,7 +474,7 @@ oberon_is_compatible_var_param(oberon_type_t * Tf, oberon_type_t * Ta) /* фактический параметр может быть указателем любого типа. */ return oberon_is_some_types(Tf, Ta) - || (oberon_is_record_type(Tf) && oberon_extension_of(Ta, Tf)) + || (oberon_is_record_type(Tf) && oberon_extension_of(Tf, Ta)) || (oberon_is_system_byte_type(Tf) && (oberon_is_char_type(Ta) || oberon_is_byte_type(Ta))) || (oberon_is_array_of_system_byte_type(Tf)) || (oberon_is_system_ptr_type(Tf));