Module: wine Branch: master Commit: 87e12632fab023e042639566707e66dcb8b62ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e12632fab023e04263956670...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Nov 4 10:07:07 2008 +0100
wrc: Fix the duplicate resource check for user-defined types.
---
tools/wrc/parser.y | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 6c5043d..c0cc2ba 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -417,7 +417,8 @@ resources if(rsc->type == head->type && rsc->lan->id == head->lan->id && rsc->lan->sub == head->lan->sub - && !compare_name_id(rsc->name, head->name)) + && !compare_name_id(rsc->name, head->name) + && (rsc->type != res_usr || !compare_name_id(rsc->res.usr->type,head->res.usr->type))) { yyerror("Duplicate resource name '%s'", get_nameid_str(rsc->name)); }