diff options
20 files changed, 57 insertions, 60 deletions
diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx index 08032e9c8b2b..1444dac0bf1e 100644 --- a/embedserv/source/embed/ed_ioleobject.cxx +++ b/embedserv/source/embed/ed_ioleobject.cxx @@ -329,7 +329,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::SetColorScheme( LOGPALETTE // IDispatch -COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfoCount( unsigned int FAR* pctinfo ) +COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfoCount(unsigned int* pctinfo) { if ( m_pDocHolder->GetIDispatch() ) return m_pDocHolder->GetIDispatch()->GetTypeInfoCount( pctinfo ); @@ -337,7 +337,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfoCount( unsigned return E_NOTIMPL; } -COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfo( unsigned int iTInfo, LCID lcid, ITypeInfo FAR* FAR* ppTInfo ) +COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfo(unsigned int iTInfo, LCID lcid, + ITypeInfo** ppTInfo) { if ( m_pDocHolder->GetIDispatch() ) return m_pDocHolder->GetIDispatch()->GetTypeInfo( iTInfo, lcid, ppTInfo ); @@ -346,10 +347,10 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfo( unsigned int } COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetIDsOfNames( REFIID riid, - OLECHAR FAR* FAR* rgszNames, + OLECHAR** rgszNames, unsigned int cNames, LCID lcid, - DISPID FAR* rgDispId ) + DISPID* rgDispId ) { if ( m_pDocHolder->GetIDispatch() ) return m_pDocHolder->GetIDispatch()->GetIDsOfNames( riid, rgszNames, cNames, lcid, rgDispId ); @@ -364,10 +365,10 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::Invoke( DISPID dispIdMembe REFIID riid, LCID lcid, WORD wFlags, - DISPPARAMS FAR* pDispParams, - VARIANT FAR* pVarResult, - EXCEPINFO FAR* pExcepInfo, - unsigned int FAR* puArgErr ) + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + unsigned int* puArgErr ) { if ( m_pDocHolder->GetIDispatch() ) return m_pDocHolder->GetIDispatch()->Invoke( dispIdMember, diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index 68d3a45dd94b..1ccb2bc28a05 100644 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx @@ -274,7 +274,7 @@ HRESULT EmbedDocument_Impl::SaveTo_Impl( IStorage* pStg ) // IUnknown -COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::QueryInterface( REFIID riid, void FAR* FAR* ppv ) +COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::QueryInterface(REFIID riid, void** ppv) { if(IsEqualIID(riid, IID_IUnknown)) { diff --git a/embedserv/source/embed/iipaobj.cxx b/embedserv/source/embed/iipaobj.cxx index 6947b1ea6ba8..008a33f11925 100644 --- a/embedserv/source/embed/iipaobj.cxx +++ b/embedserv/source/embed/iipaobj.cxx @@ -35,7 +35,7 @@ CIIAObj::~CIIAObj() /* IUnknown methods */ -STDMETHODIMP CIIAObj::QueryInterface(REFIID riid, LPVOID FAR *ppv) +STDMETHODIMP CIIAObj::QueryInterface(REFIID riid, LPVOID* ppv) { *ppv=nullptr; diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx index 4d3eea9d3af2..ef8004a3ce02 100644 --- a/embedserv/source/embed/servprov.cxx +++ b/embedserv/source/embed/servprov.cxx @@ -132,7 +132,7 @@ bool EmbedProviderFactory_Impl::deregisterClass() return (hresult == NOERROR); } -COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedProviderFactory_Impl::QueryInterface(REFIID riid, void FAR* FAR* ppv) +COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedProviderFactory_Impl::QueryInterface(REFIID riid, void** ppv) { if(IsEqualIID(riid, IID_IUnknown)) { @@ -168,9 +168,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) EmbedProviderFactory_Impl::Release() return nCount; } -COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedProviderFactory_Impl::CreateInstance(IUnknown FAR* punkOuter, - REFIID riid, - void FAR* FAR* ppv) +COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedProviderFactory_Impl::CreateInstance(IUnknown* punkOuter, + REFIID riid, void** ppv) { punkOuter = nullptr; diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx index 488b142bc1a8..eb9df82fd441 100644 --- a/embedserv/source/inc/embeddoc.hxx +++ b/embedserv/source/inc/embeddoc.hxx @@ -63,7 +63,7 @@ public: virtual ~EmbedDocument_Impl(); /* IUnknown methods */ - STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override; + STDMETHOD(QueryInterface)(REFIID riid, LPVOID* ppvObj) override; STDMETHOD_(ULONG, AddRef)() override; STDMETHOD_(ULONG, Release)() override; @@ -127,10 +127,10 @@ public: STDMETHOD(GetCurFile) ( LPOLESTR *ppszFileName ) override; /* IDispatch methods */ - STDMETHOD(GetTypeInfoCount) ( unsigned int FAR* pctinfo ) override; - STDMETHOD(GetTypeInfo) ( unsigned int iTInfo, LCID lcid, ITypeInfo FAR* FAR* ppTInfo ) override; - STDMETHOD(GetIDsOfNames) ( REFIID riid, OLECHAR FAR* FAR* rgszNames, unsigned int cNames, LCID lcid, DISPID FAR* rgDispId ) override; - STDMETHOD(Invoke) ( DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult, EXCEPINFO FAR* pExcepInfo, unsigned int FAR* puArgErr ) override; + STDMETHOD(GetTypeInfoCount)(unsigned int* pctinfo) override; + STDMETHOD(GetTypeInfo)(unsigned int iTInfo, LCID lcid, ITypeInfo** ppTInfo) override; + STDMETHOD(GetIDsOfNames)(REFIID riid, OLECHAR** rgszNames, unsigned int cNames, LCID lcid, DISPID* rgDispId) override; + STDMETHOD(Invoke)(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, unsigned int* puArgErr) override; /* IExternalConnection methods */ virtual DWORD STDMETHODCALLTYPE AddConnection( DWORD extconn, DWORD reserved) override; diff --git a/embedserv/source/inc/iipaobj.hxx b/embedserv/source/inc/iipaobj.hxx index 8bcc04688385..de91f6b854a9 100644 --- a/embedserv/source/inc/iipaobj.hxx +++ b/embedserv/source/inc/iipaobj.hxx @@ -38,7 +38,7 @@ public: virtual ~CIIAObj(); /* IUnknown methods */ - STDMETHODIMP QueryInterface(REFIID, LPVOID FAR * ppvObj) override; + STDMETHODIMP QueryInterface(REFIID, LPVOID* ppvObj) override; STDMETHODIMP_(ULONG) AddRef() override; STDMETHODIMP_(ULONG) Release() override; diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx index 6d1d887da4c0..790769fe32b1 100644 --- a/embedserv/source/inc/servprov.hxx +++ b/embedserv/source/inc/servprov.hxx @@ -60,12 +60,12 @@ public: bool deregisterClass(); /* IUnknown methods */ - STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override; + STDMETHOD(QueryInterface)(REFIID riid, LPVOID* ppvObj) override; STDMETHOD_(ULONG, AddRef)() override; 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)(int fLock) override; protected: 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 ) diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx index 23a1df21a579..ea8562f0703d 100644 --- a/embedserv/source/inprocserv/inprocembobj.cxx +++ b/embedserv/source/inprocserv/inprocembobj.cxx @@ -272,7 +272,7 @@ void InprocEmbedDocument_Impl::Clean() // IUnknown -COM_DECLSPEC_NOTHROW STDMETHODIMP InprocEmbedDocument_Impl::QueryInterface( REFIID riid, void FAR* FAR* ppv ) +COM_DECLSPEC_NOTHROW STDMETHODIMP InprocEmbedDocument_Impl::QueryInterface(REFIID riid, void** ppv) { if(IsEqualIID(riid, IID_IUnknown)) { @@ -1641,7 +1641,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP InprocEmbedDocument_Impl::Invoke( DISPID dispI // IUnknown -COM_DECLSPEC_NOTHROW STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::QueryInterface( REFIID riid, void FAR* FAR* ppv ) +COM_DECLSPEC_NOTHROW STDMETHODIMP +InprocEmbedDocument_Impl::InternalCacheWrapper::QueryInterface(REFIID riid, void** ppv) { return m_rOwnDocument.QueryInterface( riid, ppv ); } diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx index 5b387bc2beef..6e102cf51202 100644 --- a/extensions/source/activex/SOActiveX.cxx +++ b/extensions/source/activex/SOActiveX.cxx @@ -223,7 +223,7 @@ HRESULT CSOActiveX::Cleanup() pDispDocumentCloser ); if ( SUCCEEDED( hr ) && pDispDocumentCloser ) { - SAFEARRAY FAR* pInitFrame = SafeArrayCreateVector( VT_VARIANT, 0, 1 ); + SAFEARRAY* pInitFrame = SafeArrayCreateVector(VT_VARIANT, 0, 1); LONG nInitInd = 0; CComVariant pFrameVariant( mpDispFrame ); SafeArrayPutElement( pInitFrame, &nInitInd, &pFrameVariant ); @@ -590,7 +590,7 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height ) hr = GetIDispByFunc( mpDispFactory, L"createInstance", &aServiceName, 1, mpInstanceLocker ); if( SUCCEEDED( hr ) && mpInstanceLocker ) { - SAFEARRAY FAR* pInitVals = SafeArrayCreateVector( VT_VARIANT, 0, 3 ); + SAFEARRAY* pInitVals = SafeArrayCreateVector(VT_VARIANT, 0, 3); // the first sequence element LONG nInitInd = 0; @@ -631,7 +631,7 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height ) HRESULT CSOActiveX::CallLoadComponentFromURL1PBool( OLECHAR const * sUrl, OLECHAR const * sArgName, BOOL sArgVal ) { - SAFEARRAY FAR* pPropVals = SafeArrayCreateVector( VT_DISPATCH, 0, 1 ); + SAFEARRAY* pPropVals = SafeArrayCreateVector(VT_DISPATCH, 0, 1); LONG ix = 0; CComPtr<IDispatch> pdispPropVal; HRESULT hr = GetUnoStruct( L"com.sun.star.beans.PropertyValue", pdispPropVal ); @@ -681,7 +681,7 @@ HRESULT CSOActiveX::CallDispatchMethod( OLECHAR const * sUrl, pdispXDispatch ); if( !SUCCEEDED( hr ) ) return hr; - SAFEARRAY FAR* pPropVals = SafeArrayCreateVector( VT_DISPATCH, 0, count ); + SAFEARRAY* pPropVals = SafeArrayCreateVector(VT_DISPATCH, 0, count); for( LONG ix = 0; ix < static_cast<LONG>(count); ix ++ ) { CComPtr<IDispatch> pdispPropVal; @@ -740,7 +740,7 @@ void CSOActiveX::CallbackCreateXInputStream( CBindStatusCallback<CSOActiveX>* /* if( SUCCEEDED( hr ) && mpDispTempFile ) { - SAFEARRAY FAR* pDataArray = SafeArrayCreateVector( VT_I1, 0, dwSize ); + SAFEARRAY* pDataArray = SafeArrayCreateVector(VT_I1, 0, dwSize); if ( pDataArray ) { diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx index f5497fc0efdd..f40f6263512d 100644 --- a/extensions/source/activex/SODispatchInterceptor.cxx +++ b/extensions/source/activex/SODispatchInterceptor.cxx @@ -58,10 +58,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorI return S_FALSE; } -STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL, - BSTR aTargetFrameName, - long nSearchFlags, - IDispatch FAR* FAR* retVal ) +STDMETHODIMP SODispatchInterceptor::queryDispatch(IDispatch* aURL, BSTR aTargetFrameName, + long nSearchFlags, IDispatch** retVal) { if ( !aURL || !retVal ) return E_FAIL; @@ -116,7 +114,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL, return S_OK; } -STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts, SAFEARRAY FAR* FAR* retVal) +STDMETHODIMP SODispatchInterceptor::queryDispatches(SAFEARRAY* aDescripts, SAFEARRAY** retVal) { if ( !aDescripts || !retVal || SafeArrayGetDim( aDescripts ) != 1 ) return E_FAIL; @@ -156,7 +154,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts, } -STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR* aArgs) +STDMETHODIMP SODispatchInterceptor::dispatch(IDispatch* aURL, SAFEARRAY* aArgs) { // get url from aURL OLECHAR const * pUrlName = L"Complete"; @@ -211,19 +209,20 @@ STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR return S_OK; } -STDMETHODIMP SODispatchInterceptor::addStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/) +STDMETHODIMP SODispatchInterceptor::addStatusListener(IDispatch* /*xControl*/, IDispatch* /*aURL*/) { // not implemented return S_OK; } -STDMETHODIMP SODispatchInterceptor::removeStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/) +STDMETHODIMP SODispatchInterceptor::removeStatusListener(IDispatch* /*xControl*/, + IDispatch* /*aURL*/) { // not implemented return S_OK; } -STDMETHODIMP SODispatchInterceptor::getInterceptedURLs( SAFEARRAY FAR* FAR* pVal ) +STDMETHODIMP SODispatchInterceptor::getInterceptedURLs(SAFEARRAY** pVal) { *pVal = SafeArrayCreateVector( VT_BSTR, 0, 3 ); diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index 1f14fa01032d..8fc03c256d96 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -137,9 +137,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) OneInstanceOleWrapper::Release() return refCount; } -COM_DECLSPEC_NOTHROW STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown FAR* punkOuter, - REFIID riid, - void FAR* FAR* ppv) +COM_DECLSPEC_NOTHROW STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown* punkOuter, + REFIID riid, void** ppv) { comphelper::Automation::AutomationInvokedZone aAutomationActive; diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx index 57debb03779a..b3194c415332 100644 --- a/extensions/source/ole/servprov.hxx +++ b/extensions/source/ole/servprov.hxx @@ -70,7 +70,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: diff --git a/extensions/test/ole/MfcControl/MfcControl.cpp b/extensions/test/ole/MfcControl/MfcControl.cpp index cb7f723e399b..7ae701349996 100644 --- a/extensions/test/ole/MfcControl/MfcControl.cpp +++ b/extensions/test/ole/MfcControl/MfcControl.cpp @@ -27,7 +27,7 @@ static char THIS_FILE[] = __FILE__; #endif -CMfcControlApp NEAR theApp; +CMfcControlApp theApp; const GUID CDECL BASED_CODE _tlid = { 0xac221fb3, 0xa0d8, 0x11d4, { 0x83, 0x3b, 0, 0x50, 0x4, 0x52, 0x6a, 0xb4 } }; diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.cpp b/extensions/test/ole/MfcControl/MfcControlCtl.cpp index 402c0ccbf81e..e64ed65705c9 100644 --- a/extensions/test/ole/MfcControl/MfcControlCtl.cpp +++ b/extensions/test/ole/MfcControl/MfcControlCtl.cpp @@ -256,7 +256,7 @@ double CMfcControlCtrl::inDouble(double val) return val+1; } -VARIANT CMfcControlCtrl::inVariant(const VARIANT FAR& val) +VARIANT CMfcControlCtrl::inVariant(const VARIANT& val) { VARIANT vaResult; VariantInit(&vaResult); @@ -305,7 +305,7 @@ void CMfcControlCtrl::outLong(long* val) *val= 1234; } -void CMfcControlCtrl::outString(BSTR FAR* val) +void CMfcControlCtrl::outString(BSTR* val) { *val= SysAllocString(L"A string from CMfcControlCtrl::outString "); } @@ -320,14 +320,14 @@ void CMfcControlCtrl::outDouble(double* val) *val= 3.145; } -void CMfcControlCtrl::outVariant(VARIANT FAR* val) +void CMfcControlCtrl::outVariant(VARIANT* val) { VariantInit( val); val->vt= VT_BSTR; val->bstrVal= SysAllocString( L"a string in a VARIANT"); } -void CMfcControlCtrl::outObject(LPDISPATCH FAR* val) +void CMfcControlCtrl::outObject(LPDISPATCH* val) { //{BFE10EBE-8584-11D4-005004526AB4} HRESULT hr= S_OK; diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.h b/extensions/test/ole/MfcControl/MfcControlCtl.h index 865085467ece..b1d74270b993 100644 --- a/extensions/test/ole/MfcControl/MfcControlCtl.h +++ b/extensions/test/ole/MfcControl/MfcControlCtl.h @@ -68,15 +68,15 @@ protected: afx_msg BSTR inString(BSTR* val); afx_msg float inFloat(float val); afx_msg double inDouble(double val); - afx_msg VARIANT inVariant(const VARIANT FAR& val); + afx_msg VARIANT inVariant(const VARIANT& val); afx_msg LPDISPATCH inObject(LPDISPATCH val); afx_msg void outShort(short* val); afx_msg void outLong(long* val); - afx_msg void outString(BSTR FAR* val); + afx_msg void outString(BSTR* val); afx_msg void outFloat(float* val); afx_msg void outDouble(double* val); - afx_msg void outVariant(VARIANT FAR* val); - afx_msg void outObject(LPDISPATCH FAR* val); + afx_msg void outVariant(VARIANT* val); + afx_msg void outObject(LPDISPATCH* val); //}}AFX_DISPATCH DECLARE_DISPATCH_MAP() diff --git a/external/unixODBC/inc/odbc/sqltypes.h b/external/unixODBC/inc/odbc/sqltypes.h index 5cadacb4c359..939c5d29bd60 100644 --- a/external/unixODBC/inc/odbc/sqltypes.h +++ b/external/unixODBC/inc/odbc/sqltypes.h @@ -73,7 +73,6 @@ extern "C" { ***************************/ #ifndef ALLREADY_HAVE_WINDOWS_TYPE -#define FAR #define CALLBACK #define SQL_API #define BOOL int diff --git a/hwpfilter/source/hgzip.cxx b/hwpfilter/source/hgzip.cxx index 58d6ca015b89..56dc6268c273 100644 --- a/hwpfilter/source/hgzip.cxx +++ b/hwpfilter/source/hgzip.cxx @@ -143,7 +143,7 @@ static int destroy(gz_stream * s) // typedef unsigned char Byte -// typedef Byte FAR Bytef; +// typedef Byte Bytef; /* =========================================================================== Reads the given number of uncompressed bytes from the compressed file. gz_read returns the number of bytes actually read (0 for end of file). diff --git a/odk/examples/OLE/activex/SOActiveX.cpp b/odk/examples/OLE/activex/SOActiveX.cpp index f98e2ddb1c37..81159e489f2e 100644 --- a/odk/examples/OLE/activex/SOActiveX.cpp +++ b/odk/examples/OLE/activex/SOActiveX.cpp @@ -436,7 +436,7 @@ HRESULT CSOActiveX::CallDispatch1PBool( OLECHAR* sUrl, OLECHAR* sArgName, BOOL s pdispXDispatch ); if( !SUCCEEDED( hr ) ) return hr; - SAFEARRAY FAR* pPropVals = SafeArrayCreateVector( VT_DISPATCH, 0, 1 ); + SAFEARRAY* pPropVals = SafeArrayCreateVector(VT_DISPATCH, 0, 1); long ix = 0; CComPtr<IDispatch> pdispPropVal; hr = GetUnoStruct( L"com.sun.star.beans.PropertyValue", pdispPropVal ); diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index 71cee43ffad8..6f0b18cbda8b 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -258,7 +258,7 @@ typedef struct tagDRIVEENUM LPCWSTR lpIdent; WCHAR cBuffer[/*('Z' - 'A' + 1) * sizeof("A:\\") + 1*/256]; LPCWSTR lpCurrent; -} DRIVEENUM, * PDRIVEENUM, FAR * LPDRIVEENUM; +} DRIVEENUM, *PDRIVEENUM, *LPDRIVEENUM; } @@ -329,7 +329,7 @@ typedef struct tagDIRECTORY { HANDLE hFind; WIN32_FIND_DATAW aFirstData; -} DIRECTORY, *PDIRECTORY, FAR *LPDIRECTORY; +} DIRECTORY, *PDIRECTORY, *LPDIRECTORY; } |