X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon-type-compat.c;h=60b37c40e76895feb562ccfda9930c8462cd8440;hb=9531d399c60190a8daf625dd99f9c141753bba5e;hp=6c3b698cbb88e41066ba632d23608ef70145d06a;hpb=d25fb653bfe19a696d3f53abd784d32ba2d3ee03;p=dsw-obn.git diff --git a/src/oberon-type-compat.c b/src/oberon-type-compat.c index 6c3b698..60b37c4 100644 --- a/src/oberon-type-compat.c +++ b/src/oberon-type-compat.c @@ -485,14 +485,9 @@ oberon_get_longer_type(oberon_context_t * ctx, oberon_type_t * a, oberon_type_t { return a; } - else if(oberon_incluses_type(b, a)) - { - return b; - } else { - oberon_error(ctx, "oberon_get_longer_type: error"); - return NULL; + return b; } } @@ -504,13 +499,8 @@ oberon_get_longer_real_type(oberon_context_t * ctx, oberon_type_t * a, oberon_ty { return ctx -> real_type; } - else if(oberon_is_real_type(result)) - { - return result; - } else { - oberon_error(ctx, "oberon_get_longer_real_type: error"); - return NULL; + return result; } }