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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/source/filter/jpeg/jpeg.h | 4 | ||||
| -rw-r--r-- | vcl/source/window/splitwin.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/app/salshl.cxx | 8 |
3 files changed, 0 insertions, 14 deletions
diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h index bcbe75c5f4ec..6efa927e7c6f 100644 --- a/vcl/source/filter/jpeg/jpeg.h +++ b/vcl/source/filter/jpeg/jpeg.h @@ -20,10 +20,6 @@ #ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_H #define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_H -#if defined( ICC ) -#include <stdio.h> -#endif - #if defined (UNX) || defined(__MINGW32__) #include <sys/types.h> #endif diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 232218957c61..89375271e9c7 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -364,7 +364,6 @@ static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, const Point& rPos, { if ( pItems[i].mnWidth && pItems[i].mnHeight ) { - // Wegen ICC auftrennen Point aPoint( pItems[i].mnLeft, pItems[i].mnTop ); Size aSize( pItems[i].mnWidth, pItems[i].mnHeight ); Rectangle aRect( aPoint, aSize ); @@ -999,7 +998,6 @@ void SplitWindow::ImplDrawBack( SplitWindow* pWindow, ImplSplitSet* pSet ) { if ( pSet->mpBitmap || pSet->mpWallpaper ) { - // Wegen ICC auftrennen Point aPoint( pItems[i].mnLeft, pItems[i].mnTop ); Size aSize( pItems[i].mnWidth, pItems[i].mnHeight ); Rectangle aRect( aPoint, aSize ); diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index 67feefc0b0ff..9e6fd34e020b 100644 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -34,11 +34,7 @@ extern "C" #ifdef __MINGW32__ sal_Bool WINAPI DllMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) #else -#ifdef ICC -int _CRT_init(void); -#else BOOL WINAPI _CRT_INIT( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ); -#endif BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) #endif @@ -48,11 +44,7 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) aSalShlData.mhInst = hInst; #ifndef __MINGW32__ -#ifdef ICC - if ( _CRT_init() == -1 ) -#else if ( !_CRT_INIT( hInst, nReason, pReserved ) ) -#endif return 0; #else (void)pReserved; |