diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-02-01 08:57:26 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-02-01 07:47:11 +0100 |
| commit | 52e6dea5220c563405e37e1533f45d8d3aaa0c04 (patch) | |
| tree | 4dd7fb7db1e9a5e84ccfbb76cebabda3a79b623f /embedserv/source/inprocserv/dllentry.cxx | |
| parent | 7140cd40170d60c65672b45ce634f9a35948f108 (diff) | |
Drop FAR/NEAR from 16-bit WinAPI times
Change-Id: Idf71c662138c281333a83cc76a9d75cbf086f362
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110236
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'embedserv/source/inprocserv/dllentry.cxx')
| -rw-r--r-- | embedserv/source/inprocserv/dllentry.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index 78b7d18edf0a..dc7829c54ba1 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -147,7 +147,7 @@ public: STDMETHOD_(ULONG, Release)() override; /* IClassFactory methods */ - STDMETHOD(CreateInstance)(IUnknown FAR* punkOuter, REFIID riid, void FAR* FAR* ppv) override; + STDMETHOD(CreateInstance)(IUnknown* punkOuter, REFIID riid, void** ppv) override; STDMETHOD(LockServer)(BOOL fLock) override; protected: @@ -298,9 +298,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) InprocEmbedProvider_Impl::Release() } -COM_DECLSPEC_NOTHROW STDMETHODIMP InprocEmbedProvider_Impl::CreateInstance(IUnknown FAR* punkOuter, - REFIID riid, - void FAR* FAR* ppv) +COM_DECLSPEC_NOTHROW STDMETHODIMP InprocEmbedProvider_Impl::CreateInstance(IUnknown* punkOuter, + REFIID riid, void** ppv) { // TODO/LATER: should the aggregation be supported? // if ( punkOuter != NULL && riid != IID_IUnknown ) |