[Libreoffice-commits] .: 2 commits - idl/source sfx2/source svx/source

[Thomas Arnhold]

 idl/source/prj/svidl.cxx         |    2 +-
 sfx2/source/control/dispatch.cxx |    2 +-
 sfx2/source/control/objface.cxx  |    2 +-
 svx/source/unodraw/unoprov.cxx   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e130c111f32a5fba002706d071e4d8c4a127a9c4
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Feb 21 18:34:50 2011 +0100

    Remove CSET support
    
    Obsolete IBM CSet C-Compiler
    
    svidl.cxx: This seem to be an error, all other files check for PM && !CSET.

diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 53237f1..ed6a9f5 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -90,7 +90,7 @@ BOOL FileMove_Impl( const String & rFile1, const String & rFile2, BOOL bImmerVer
     return 0 == aF2.Kill();
 }
 
-#if defined( UNX ) || (defined( PM2 ) && defined( CSET )) || defined (__MINGW32__) || defined( OS2 )
+#if defined( UNX ) || defined( PM2 ) || defined (__MINGW32__) || defined( OS2 )
 int main ( int argc, char ** argv)
 {
 #else
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index e82edfe..96536be 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2128,7 +2128,7 @@ void SfxDispatcher::SetSlotFilter
 
 //--------------------------------------------------------------------
 EXTERN_C
-#if defined( PM2 ) && !defined( CSET )
+#if defined( PM2 )
 int _stdcall
 #else
 #ifdef WNT
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 7e3a581..2d07117 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -47,7 +47,7 @@ DBG_NAME(SfxInterface)
 //====================================================================
 
 EXTERN_C
-#if defined( PM2 ) && !defined( CSET )
+#if defined( PM2 )
 int _stdcall
 #else
 #ifdef WNT
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 2c85070..e049133 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -934,7 +934,7 @@ UINT32 UHashMap::getId( const OUString& rCompareString )
 SvxUnoPropertyMapProvider aSvxMapProvider;
 
 EXTERN_C
-#if defined( PM2 ) && !defined( CSET )
+#if defined( PM2 )
 int _stdcall
 #else
 #ifdef WNT
commit 190b44d2d22a1a6684f66166a41f4f0e67d18487
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun Feb 20 13:25:08 2011 +0100

    Remove MTW leftover

diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index fcbf802..53237f1 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -90,7 +90,7 @@ BOOL FileMove_Impl( const String & rFile1, const String & rFile2, BOOL bImmerVer
     return 0 == aF2.Kill();
 }
 
-#if defined( UNX ) || (defined( PM2 ) && defined( CSET )) || defined (MTW) || defined (__MINGW32__) || defined( OS2 )
+#if defined( UNX ) || (defined( PM2 ) && defined( CSET )) || defined (__MINGW32__) || defined( OS2 )
 int main ( int argc, char ** argv)
 {
 #else