From b9d28478e42dd20c97a0937cee16b22eeeea21c1 Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Sun, 14 May 2000 23:09:21 +0000 Subject: [PATCH] repair the NS_IMPL_QUERY_INTERFACE_INHERITED3 macro --- xpcom/base/nsISupportsUtils.h | 4 ++-- xpcom/glue/nsISupportsUtils.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xpcom/base/nsISupportsUtils.h b/xpcom/base/nsISupportsUtils.h index d3bda882e843..1849d02faabd 100644 --- a/xpcom/base/nsISupportsUtils.h +++ b/xpcom/base/nsISupportsUtils.h @@ -643,11 +643,11 @@ NS_IMETHODIMP_(nsrefcnt) Class::Release(void) \ NS_IMPL_QUERY_TAIL_INHERITING(Super) \ #define NS_IMPL_QUERY_INTERFACE_INHERITED3(Class, Super, i1, i2, i3) \ - NS_IMPL_QUERY_INHERITED_HEAD(Class) \ + NS_IMPL_QUERY_HEAD(Class) \ NS_IMPL_QUERY_BODY(i1) \ NS_IMPL_QUERY_BODY(i2) \ NS_IMPL_QUERY_BODY(i3) \ - NS_IMPL_QUERY_INHERITED_TAIL(Class, Super) \ + NS_IMPL_QUERY_TAIL_INHERITING(Super) \ #define NS_IMPL_ISUPPORTS_INHERITED(Class, Super, i1) \ NS_IMPL_ISUPPORTS_INHERITED1(Class, Super, i1) \ diff --git a/xpcom/glue/nsISupportsUtils.h b/xpcom/glue/nsISupportsUtils.h index d3bda882e843..1849d02faabd 100644 --- a/xpcom/glue/nsISupportsUtils.h +++ b/xpcom/glue/nsISupportsUtils.h @@ -643,11 +643,11 @@ NS_IMETHODIMP_(nsrefcnt) Class::Release(void) \ NS_IMPL_QUERY_TAIL_INHERITING(Super) \ #define NS_IMPL_QUERY_INTERFACE_INHERITED3(Class, Super, i1, i2, i3) \ - NS_IMPL_QUERY_INHERITED_HEAD(Class) \ + NS_IMPL_QUERY_HEAD(Class) \ NS_IMPL_QUERY_BODY(i1) \ NS_IMPL_QUERY_BODY(i2) \ NS_IMPL_QUERY_BODY(i3) \ - NS_IMPL_QUERY_INHERITED_TAIL(Class, Super) \ + NS_IMPL_QUERY_TAIL_INHERITING(Super) \ #define NS_IMPL_ISUPPORTS_INHERITED(Class, Super, i1) \ NS_IMPL_ISUPPORTS_INHERITED1(Class, Super, i1) \