=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ctfconv/parse.c,v retrieving revision 1.10 retrieving revision 1.11 diff -c -r1.10 -r1.11 *** src/usr.bin/ctfconv/parse.c 2017/10/31 10:08:51 1.10 --- src/usr.bin/ctfconv/parse.c 2018/01/31 14:47:13 1.11 *************** *** 1,4 **** ! /* $OpenBSD: parse.c,v 1.10 2017/10/31 10:08:51 mpi Exp $ */ /* * Copyright (c) 2016-2017 Martin Pieuchot --- 1,4 ---- ! /* $OpenBSD: parse.c,v 1.11 2018/01/31 14:47:13 mpi Exp $ */ /* * Copyright (c) 2016-2017 Martin Pieuchot *************** *** 322,327 **** --- 322,332 ---- int diff; if ((diff = (a->it_type - b->it_type)) != 0) + return diff; + + /* Basic types need to have the same size. */ + if ((a->it_type == CTF_K_INTEGER || a->it_type == CTF_K_FLOAT) && + (diff = (a->it_size - b->it_size) != 0)) return diff; /* Match by name */