[PATCH 2/2] oleaut32/tests: Don't use a C99 keyword as a method name.

Charles Davis cdavis5x at gmail.com
Tue Sep 18 00:51:14 CDT 2012


From: Charles Davis <cdavis at mymail.mines.edu>

Clang defaults to C99 (actually, C99 with GNU extensions); as a result,
it chokes on the tmarshal test unless you force it to C89 with -std=gnu89.
This gets us one step closer to not having to do that.
---
 dlls/oleaut32/tests/tmarshal.c   | 4 ++--
 dlls/oleaut32/tests/tmarshal.idl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c
index ad56123..867cc71 100644
--- a/dlls/oleaut32/tests/tmarshal.c
+++ b/dlls/oleaut32/tests/tmarshal.c
@@ -706,7 +706,7 @@ static HRESULT WINAPI Widget_put_prop_req_arg(
     return S_OK;
 }
 
-static HRESULT WINAPI Widget_restrict(IWidget* iface, INT *i)
+static HRESULT WINAPI Widget__restrict(IWidget* iface, INT *i)
 {
     trace("restrict\n");
     *i = DISPID_TM_RESTRICTED;
@@ -756,7 +756,7 @@ static const struct IWidgetVtbl Widget_VTable =
     Widget_ByRefUInt,
     Widget_put_prop_opt_arg,
     Widget_put_prop_req_arg,
-    Widget_restrict,
+    Widget__restrict,
     Widget_neg_restrict
 };
 
diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl
index c589574..8dca84c 100644
--- a/dlls/oleaut32/tests/tmarshal.idl
+++ b/dlls/oleaut32/tests/tmarshal.idl
@@ -161,7 +161,7 @@ library TestTypelib
         HRESULT prop_req_arg([in] INT req, [in] INT i);
 
         [id(DISPID_TM_RESTRICTED), restricted]
-        HRESULT restrict([out, retval] INT *i);
+        HRESULT _restrict([out, retval] INT *i);
 
         [id(DISPID_TM_NEG_RESTRICTED), restricted]
         HRESULT neg_restrict([out, retval] INT *i);
-- 
1.7.12




More information about the wine-patches mailing list