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

[Thomas Arnhold]

 basic/source/inc/opcodes.hxx                   |    4 ----
 connectivity/source/inc/odbc/OFunctiondefs.hxx |    2 +-
 idl/source/prj/svidl.cxx                       |    2 +-
 sfx2/source/control/dispatch.cxx               |    2 +-
 sfx2/source/control/objface.cxx                |    2 +-
 svx/source/unodraw/unoprov.cxx                 |    2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 75759ca4dddf0719c2d4cfbf73f8d3351d06e118
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Feb 16 22:55:22 2011 +0100

    Remove WTC support
    
    http://www.openoffice.org/issues/show_bug.cgi?id=52746
    
    "WTC - watcom compiler (OS2, WNT?) - obsolete"

diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index 44889f8..16edba2 100644
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -111,7 +111,7 @@
 
 // In der ODBC.H von Watcom werden Strings als char * erwartet
 // (nicht, wie sonst bei ODBC ueblich, als UCHAR *).
-#if defined( ICC ) || defined( WTC )
+#if defined( ICC )
 #define SDB_ODBC_CHAR unsigned char
 #else
 #define SDB_ODBC_CHAR char
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 8260bab..fcbf802 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 (WTC) || defined (MTW) || defined (__MINGW32__) || defined( OS2 )
+#if defined( UNX ) || (defined( PM2 ) && defined( CSET )) || defined (MTW) || 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 cf58fb0..e82edfe 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 ) && !defined( WTC ))
+#if defined( PM2 ) && !defined( CSET )
 int _stdcall
 #else
 #ifdef WNT
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index e74b50d..7e3a581 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 ) && !defined( WTC ))
+#if defined( PM2 ) && !defined( CSET )
 int _stdcall
 #else
 #ifdef WNT
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index fcbf8b5..2c85070 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 ) && !defined( WTC ))
+#if defined( PM2 ) && !defined( CSET )
 int _stdcall
 #else
 #ifdef WNT
commit 917589cd71f9fe4c4e0e1a5c38451900ed5feb4b
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Feb 16 22:43:47 2011 +0100

    Remove MTW support
    
    http://www.openoffice.org/issues/show_bug.cgi?id=52746
    
    "MTW - metrowerks compiler (mac OS9 ?) - obsolete"

diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx
index 0481051..30157a7 100644
--- a/basic/source/inc/opcodes.hxx
+++ b/basic/source/inc/opcodes.hxx
@@ -31,10 +31,6 @@
 
 #include "sbintern.hxx"
 
-#ifdef MTW
-#undef _NUMBER
-#endif
-
 // Ein Opcode ist entweder 1, 3 oder 5 Bytes lang, je nach numerischen
 // Wert des Opcodes (s.u.).
 
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index e45703e..cf58fb0 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 ) && !defined ( MTW ) && !defined( WTC ))
+#if defined( PM2 ) && (!defined( CSET ) && !defined( WTC ))
 int _stdcall
 #else
 #ifdef WNT
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index fc1db6a..e74b50d 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 ) && !defined ( MTW ) && !defined( WTC ))
+#if defined( PM2 ) && (!defined( CSET ) && !defined( WTC ))
 int _stdcall
 #else
 #ifdef WNT
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 59e8aa3..fcbf8b5 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 ) && !defined ( MTW ) && !defined( WTC ))
+#if defined( PM2 ) && (!defined( CSET ) && !defined( WTC ))
 int _stdcall
 #else
 #ifdef WNT