Module: wine Branch: master Commit: 2952822effc71fd423e402c87aade7bcc1379f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2952822effc71fd423e402c87a...
Author: Dmitry Timoshkov dmitry@baikal.ru Date: Fri Sep 4 15:24:28 2015 +0800
oleaut32/tests: Avoid using a reserved keyword '_restrict' in an idl.
---
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 a2fa6e8..e8d5e64 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -825,7 +825,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_pos_restrict(IWidget* iface, INT *i) { trace("restrict\n"); *i = DISPID_TM_RESTRICTED; @@ -875,7 +875,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_ByRefUInt, Widget_put_prop_opt_arg, Widget_put_prop_req_arg, - Widget__restrict, + Widget_pos_restrict, Widget_neg_restrict };
diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index bf90384..33a4df9 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -175,7 +175,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 pos_restrict([out, retval] INT *i);
[id(DISPID_TM_NEG_RESTRICTED), restricted] HRESULT neg_restrict([out, retval] INT *i);