[Libreoffice-commits] .: 3 commits - rsc/source svl/inc svl/source svtools/source tools/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Feb 16 14:11:30 PST 2011
rsc/source/parser/rsckey.cxx | 4 ++--
rsc/source/parser/rsclex.hxx | 2 +-
rsc/source/prj/gui.cxx | 6 +-----
rsc/source/prj/start.cxx | 8 --------
rsc/source/rscpp/cpp3.c | 4 ++--
svl/inc/svl/svarray.hxx | 2 +-
svl/source/svdde/ddeimp.hxx | 2 +-
svl/source/svdde/ddeinf.cxx | 2 +-
svl/source/svdde/ddesvr.cxx | 2 +-
svtools/source/edit/textdoc.cxx | 2 +-
tools/source/fsys/tdir.cxx | 2 +-
tools/source/stream/stream.cxx | 4 ----
12 files changed, 12 insertions(+), 28 deletions(-)
New commits:
commit 647858098c3f6ea0cf8eef333bb04facd9aa2a74
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 23:04:44 2011 +0100
Remove BLC support
http://www.openoffice.org/issues/show_bug.cgi?id=52746
"BLC - borland compiler (OS2, win16) - obsolete"
diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index afe97b7..a77bd6b 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -170,7 +170,7 @@ void setincdirs()
* verwendete knallte es in strcpy() !
*/
-#if !defined( ZTC ) && !defined( WNT ) && !defined(BLC) && ! defined UNX && ! defined OS2
+#if !defined( ZTC ) && !defined( WNT ) && ! defined UNX && ! defined OS2
extern char *getenv( char *pStr ); /* BP */
#endif
char *pIncGetEnv = NULL; /* Pointer auf INCLUDE */
@@ -465,7 +465,7 @@ void initdefines()
int i;
time_t tvec;
-#if !defined( ZTC ) && !defined( WNT ) && !defined(BLC) && !defined(G3)
+#if !defined( ZTC ) && !defined( WNT ) && !defined(G3)
extern char *ctime();
#endif
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 09e3afb..45f2f52 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -43,15 +43,11 @@
#include <tools/solar.h>
-#if defined(BLC)
-#define SWAPNIBBLES(c) c=_crotl(c,4);
-#else
#define SWAPNIBBLES(c) \
unsigned char nSwapTmp=c; \
nSwapTmp <<= 4; \
c >>= 4; \
c |= nSwapTmp;
-#endif
#include <tools/debug.hxx>
#define ENABLE_BYTESTRING_STREAM_OPERATORS
commit be57f8bdbc111f37504ab9f0a6c5bf2181eefd93
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 22:55:37 2011 +0100
Remove WTC support
http://www.openoffice.org/issues/show_bug.cgi?id=52746
"WTC - watcom compiler (OS2, WNT?) - obsolete"
diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx
index 328ac33..f887167 100644
--- a/rsc/source/parser/rsckey.cxx
+++ b/rsc/source/parser/rsckey.cxx
@@ -48,7 +48,7 @@ extern "C" {
#if defined( ZTC ) && defined( PM2 )
int __CLIB KeyCompare( const void * pFirst, const void * pSecond );
#else
-#if defined( WNT ) && !defined( WTC ) && !defined (ICC)
+#if defined( WNT ) && !defined (ICC)
int _cdecl KeyCompare( const void * pFirst, const void * pSecond );
#else
int KeyCompare( const void * pFirst, const void * pSecond );
@@ -56,7 +56,7 @@ extern "C" {
#endif
}
-#if defined( WNT ) && !defined( WTC ) && !defined(ICC)
+#if defined( WNT ) && !defined(ICC)
int _cdecl KeyCompare( const void * pFirst, const void * pSecond ){
#else
int KeyCompare( const void * pFirst, const void * pSecond ){
diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx
index 945eb4c..da89b1a 100644
--- a/rsc/source/parser/rsclex.hxx
+++ b/rsc/source/parser/rsclex.hxx
@@ -110,7 +110,7 @@ extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion
extern "C" void yyerror( const char * );
extern "C" int yylex( void );
#else
-#if defined ( WTC ) || defined ( GCC ) || (_MSC_VER >= 1400)
+#if defined ( GCC ) || (_MSC_VER >= 1400)
int yyparse(); // forward Deklaration fuer erzeugte Funktion
#else
yyparse(); // forward Deklaration fuer erzeugte Funktion
diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx
index 27ced02..ea8a2c3 100644
--- a/rsc/source/prj/gui.cxx
+++ b/rsc/source/prj/gui.cxx
@@ -43,7 +43,7 @@ static RscCompiler * pRscCompiler = NULL;
/* */
/* Description : Gibt die Temporaeren Dateien frei. */
/****************************************************************/
-#if defined( UNX ) || ( defined( OS2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined (WTC) || defined(__MINGW32__)
+#if defined( UNX ) || ( defined( OS2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined(__MINGW32__)
void ExitProgram( void ){
#else
#if defined( CSET )
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index 2375ac6..3cdd32c 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -179,8 +179,6 @@ static BOOL CallPrePro( const ByteString& rPrePro,
nExit = spawnvp( P_WAIT, rPrePro.GetBuffer(), (char* const*)pCmdL->GetBlock() );
#elif defined CSET
nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() );
-#elif defined WTC
- nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char* const*)pCmdL->GetBlock() );
#else
nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() );
#endif
@@ -293,8 +291,6 @@ static BOOL CallRsc2( ByteString aRsc2Name,
nExit = spawnvp( P_WAIT, aRsc2Name.GetBuffer(), (char* const*)aNewCmdL.GetBlock() );
#elif defined CSET
nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (char **)(const char**)aNewCmdL.GetBlock() );
-#elif defined WTC
- nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char* const*)aNewCmdL.GetBlock() );
#else
nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char**)aNewCmdL.GetBlock() );
#endif
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 46c3c9b..bd1deb8 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -1024,7 +1024,7 @@ public:\
#define C40_PTR_REPLACE( c, p) Replace( (c const *) p )
#define C40_GETPOS( c, r) GetPos( (c const *)r )
#else
-#if defined WTC || defined ICC || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400)
+#if defined ICC || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400)
#define C40_INSERT( c, p, n ) Insert( (c const *&) p, n )
#define C40_PUSH( c, p) Push( (c const *&) p )
#define C40_PTR_INSERT( c, p ) Insert( (c const *&) p )
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index 5777cfe..907772d 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.cxx
@@ -40,7 +40,7 @@ SV_IMPL_PTRARR( TextCharAttribs, TextCharAttribPtr );
// Vergleichmethode wird von QuickSort gerufen...
EXTERN_C
-#if defined( PM2 ) && (!defined( CSET ) && !defined( WTC ))
+#if defined( PM2 ) && !defined( CSET )
int _stdcall
#else
#ifdef WNT
diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx
index a76a07d..5851310 100644
--- a/tools/source/fsys/tdir.cxx
+++ b/tools/source/fsys/tdir.cxx
@@ -251,7 +251,7 @@ void Dir::Construct( DirEntryKind nKindFlags )
ByteString aTempName( GetName(), osl_getThreadTextEncoding() );
if ( aTempName.Search( "*" ) != STRING_NOTFOUND ||
aTempName.Search( "?" ) != STRING_NOTFOUND )
-#if defined( WNT ) && !defined( WTC )
+#if defined( WNT )
{
ByteString aTStr(CutName(), osl_getThreadTextEncoding());
char* pBuffer = new char[aTStr.Len()+1];
commit 24e2e6f335afec346b8cb367b69308e42977ef65
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 22:42:23 2011 +0100
Remove MTW support
http://www.openoffice.org/issues/show_bug.cgi?id=52746
"MTW - metrowerks compiler (mac OS9 ?) - obsolete"
diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx
index 7564b9c..27ced02 100644
--- a/rsc/source/prj/gui.cxx
+++ b/rsc/source/prj/gui.cxx
@@ -43,7 +43,7 @@ static RscCompiler * pRscCompiler = NULL;
/* */
/* Description : Gibt die Temporaeren Dateien frei. */
/****************************************************************/
-#if defined( UNX ) || ( defined( OS2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined (WTC) || defined (MTW) || defined(__MINGW32__)
+#if defined( UNX ) || ( defined( OS2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined (WTC) || defined(__MINGW32__)
void ExitProgram( void ){
#else
#if defined( CSET )
@@ -86,11 +86,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
InitRscCompiler();
RscError* pErrHdl = new RscError( lcl_determineVerbosity( argc, argv ) );
-#ifdef MTW
- RscCmdLine* pCmdLine = new RscCmdLine( argc, (char **)argv, pErrHdl );
-#else
RscCmdLine* pCmdLine = new RscCmdLine( argc, argv, pErrHdl );
-#endif
RscTypCont* pTypCont = new RscTypCont( pErrHdl,
pCmdLine->nByteOrder,
pCmdLine->aPath,
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index ab3a666..2375ac6 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -181,8 +181,6 @@ static BOOL CallPrePro( const ByteString& rPrePro,
nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() );
#elif defined WTC
nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char* const*)pCmdL->GetBlock() );
-#elif defined MTW
- nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (char**)pCmdL->GetBlock() );
#else
nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() );
#endif
@@ -297,8 +295,6 @@ static BOOL CallRsc2( ByteString aRsc2Name,
nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (char **)(const char**)aNewCmdL.GetBlock() );
#elif defined WTC
nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char* const*)aNewCmdL.GetBlock() );
-#elif defined MTW
- nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (char**)aNewCmdL.GetBlock() );
#else
nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char**)aNewCmdL.GetBlock() );
#endif
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index 73cb39a..dd54802 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -95,7 +95,7 @@ public:
static HDDEDATA CALLBACK InfCallback
( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
#else
-#if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
+#if (defined ( GCC ) && defined ( OS2 )) || defined( ICC )
static HDDEDATA CALLBACK CliCallback
( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
static HDDEDATA CALLBACK SvrCallback
diff --git a/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx
index 89091ed..1d281b3 100644
--- a/svl/source/svdde/ddeinf.cxx
+++ b/svl/source/svdde/ddeinf.cxx
@@ -41,7 +41,7 @@
HDDEDATA CALLBACK DdeInternal::InfCallback(
WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
#else
-#if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
+#if ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
HDDEDATA CALLBACK DdeInternal::InfCallback(
WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
#else
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index df51f18..b089a35 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -65,7 +65,7 @@ HDDEDATA CALLBACK DdeInternal::SvrCallback(
WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
HDDEDATA hData, DWORD, DWORD )
#else
-#if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
+#if ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
HDDEDATA CALLBACK DdeInternal::SvrCallback(
WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
HDDEDATA hData, DWORD, DWORD )
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index b469e47..5777cfe 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.cxx
@@ -40,7 +40,7 @@ SV_IMPL_PTRARR( TextCharAttribs, TextCharAttribPtr );
// Vergleichmethode wird von QuickSort gerufen...
EXTERN_C
-#if defined( PM2 ) && (!defined( CSET ) && !defined ( MTW ) && !defined( WTC ))
+#if defined( PM2 ) && (!defined( CSET ) && !defined( WTC ))
int _stdcall
#else
#ifdef WNT
More information about the Libreoffice-commits
mailing list