[Libreoffice-commits] .: basic/source idl/source sfx2/source

[François Tigeot]

 basic/source/classes/disas.cxx   |    2 +-
 idl/source/prj/svidl.cxx         |    2 +-
 sfx2/source/control/dispatch.cxx |    4 ----
 sfx2/source/control/objface.cxx  |    4 ----
 4 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 03c42429251fc01dc810c8726d44d037f380e5c4
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Fri Apr 22 21:36:28 2011 +0200

    Remove PM2 macro usage

diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx
index ba60d25..8dce7af 100644
--- a/basic/source/classes/disas.cxx
+++ b/basic/source/classes/disas.cxx
@@ -228,7 +228,7 @@ static const Func pOperand3[] = {
 // TODO: Why as method? Isn't a simple define sufficient?
 static const char* _crlf()
 {
-#if defined (UNX) || defined( PM2 )
+#if defined (UNX)
     return "\n";
 #else
     return "\r\n";
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 21a9bdd..6b25826 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -90,7 +90,7 @@ sal_Bool FileMove_Impl( const String & rFile1, const String & rFile2, sal_Bool b
     return 0 == aF2.Kill();
 }
 
-#if defined( UNX ) || defined( PM2 ) || defined (__MINGW32__) || defined( OS2 )
+#if defined( UNX ) || 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 ae3bfe3..a98678a 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2028,15 +2028,11 @@ void SfxDispatcher::SetSlotFilter
 
 //--------------------------------------------------------------------
 EXTERN_C
-#if defined( PM2 )
-int _stdcall
-#else
 #ifdef WNT
 int _cdecl
 #else
 int
 #endif
-#endif
 
 SfxCompareSIDs_Impl( const void* pSmaller, const void* pBigger )
 {
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index b399e19..f4e14cd 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -47,15 +47,11 @@ DBG_NAME(SfxInterface)
 //====================================================================
 
 EXTERN_C
-#if defined( PM2 )
-int _stdcall
-#else
 #ifdef WNT
 int _cdecl
 #else
 int
 #endif
-#endif
 
 SfxCompareSlots_Impl( const void* pSmaller, const void* pBigger )
 {