Nikolay Sivov : widl: Don' t output method macro if name duplicates another method name.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 65f418493683d96d4fd625ab019ea400eec4c19a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=65f418493683d96d4fd625ab01...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Fri Jul 27 20:00:18 2012 +0400

widl: Don't output method macro if name duplicates another method name.

---

 tools/widl/header.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/widl/header.c b/tools/widl/header.c
index 9ecbab5..02e3b60 100644
--- a/tools/widl/header.c
+++ b/tools/widl/header.c
@@ -856,7 +856,7 @@ static void write_method_macro(FILE *header, const type_t *iface, const char *na
       first_iface = 0;
     }
 
-    if (!is_callas(func->attrs)) {
+    if (!is_callas(func->attrs) && !is_inherited_method(iface, func)) {
       const var_t *arg;
 
       fprintf(header, "#define %s_%s(This", name, get_name(func));
@@ -949,7 +949,7 @@ static void write_inline_wrappers(FILE *header, const type_t *iface, const char
       first_iface = 0;
     }
 
-    if (!is_callas(func->attrs)) {
+    if (!is_callas(func->attrs) && !is_inherited_method(iface, func)) {
       const var_t *arg;
 
       fprintf(header, "static FORCEINLINE ");