diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-09 20:16:47 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-10 00:03:22 +0100 |
| commit | f35b3fea46532ffc54e9026e7a953f64493e7525 (patch) | |
| tree | 277cc9cea57beb6ddfc0c9bde5b25079ba1fb8fd /svl | |
| parent | 20193bcc93660a1510a7cd5ab8d0897e55ee7546 (diff) | |
clean up #ifdef ICC code
According to the dmake documentation, ICC refers to Visual Age C++ for
OS/2, which is not a supported compiler (or platform).
Change-Id: Ic9e23bc7c44de110a3a312bd007beda3b660927d
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/svdde/ddeimp.hxx | 18 | ||||
| -rw-r--r-- | svl/source/svdde/ddeinf.cxx | 10 | ||||
| -rw-r--r-- | svl/source/svdde/ddesvr.cxx | 6 |
3 files changed, 0 insertions, 34 deletions
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index d39988c39b28..bf31a1ed94c7 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -48,30 +48,12 @@ typedef ::std::vector< Conversation* > ConvList; class DdeInternal { public: -#ifdef WNT static HDDEDATA CALLBACK CliCallback ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); static HDDEDATA CALLBACK SvrCallback ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); static HDDEDATA CALLBACK InfCallback ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); -#else -#if defined( ICC ) - static HDDEDATA CALLBACK CliCallback - ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); - static HDDEDATA CALLBACK SvrCallback - ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); - static HDDEDATA CALLBACK InfCallback - ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); -#else - static HDDEDATA CALLBACK _export CliCallback - ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); - static HDDEDATA CALLBACK _export SvrCallback - ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); - static HDDEDATA CALLBACK _export InfCallback - ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); -#endif -#endif static DdeService* FindService( HSZ ); static DdeTopic* FindTopic( DdeService&, HSZ ); static DdeItem* FindItem( DdeTopic&, HSZ ); diff --git a/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx index 3e0293707c6d..743d0b338ecc 100644 --- a/svl/source/svdde/ddeinf.cxx +++ b/svl/source/svdde/ddeinf.cxx @@ -26,18 +26,8 @@ // --- DdeInternal::InfCallback() ---------------------------------- -#ifdef WNT HDDEDATA CALLBACK DdeInternal::InfCallback( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ) -#else -#if defined( ICC ) -HDDEDATA CALLBACK DdeInternal::InfCallback( - WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ) -#else -HDDEDATA CALLBACK _export DdeInternal::InfCallback( - WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ) -#endif -#endif { return (HDDEDATA)DDE_FNOTPROCESSED; } diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index beeb3d8be47f..ecce24a15644 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -46,15 +46,9 @@ class DdeItemImp : public std::vector<DdeItemImpData> {}; // --- DdeInternat::SvrCallback() ---------------------------------- -#if defined( WNT ) || defined( ICC ) HDDEDATA CALLBACK DdeInternal::SvrCallback( WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2, HDDEDATA hData, DWORD, DWORD ) -#else -HDDEDATA CALLBACK _export DdeInternal::SvrCallback( - WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2, - HDDEDATA hData, DWORD, DWORD ) -#endif { DdeServices& rAll = DdeService::GetServices(); DdeService* pService; |