X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=369c76a158df310060c9e2fe7bffe99f68118362;hb=26aba71a371f0bbcc8afd213b4398d4e4e52a6f2;hp=ea8815365c8ee7efe00ac3e7fce8272b5fa71c99;hpb=74b69bb1c46cea344e636da430ff274b0edb5d9b;p=cparser diff --git a/type_hash.c b/type_hash.c index ea88153..369c76a 100644 --- a/type_hash.c +++ b/type_hash.c @@ -1,6 +1,6 @@ /* * This file is part of cparser. - * Copyright (C) 2007-2008 Matthias Braun + * Copyright (C) 2007-2009 Matthias Braun * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -92,8 +92,6 @@ static unsigned hash_compound_type(const compound_type_t *type) return hash_ptr(type->compound); } -static unsigned hash_type(const type_t *type); - static unsigned hash_function_type(const function_type_t *type) { unsigned result = hash_ptr(type->return_type); @@ -103,6 +101,7 @@ static unsigned hash_function_type(const function_type_t *type) result ^= hash_ptr(parameter->type); parameter = parameter->next; } + result += type->modifiers; result += type->linkage; result += type->calling_convention; @@ -218,6 +217,8 @@ static bool function_types_equal(const function_type_t *type1, return false; if (type1->linkage != type2->linkage) return false; + if (type1->modifiers != type2->modifiers) + return false; if (type1->calling_convention != type2->calling_convention) return false; @@ -322,8 +323,6 @@ static bool types_equal(const type_t *type1, const type_t *type2) return false; if (type1->base.qualifiers != type2->base.qualifiers) return false; - if (type1->base.modifiers != type2->base.modifiers) - return false; switch (type1->kind) { case TYPE_ERROR: