diff options
-rw-r--r-- | basegfx/util/makefile.mk | 3 | ||||
-rw-r--r-- | i18npool/source/isolang/insys.cxx | 2 | ||||
-rw-r--r-- | i18npool/source/localedata/data/makefile.mk | 19 | ||||
-rw-r--r-- | i18npool/source/localedata/localedata.cxx | 7 | ||||
-rw-r--r-- | i18npool/source/search/makefile.mk | 2 | ||||
-rw-r--r-- | i18nutil/source/utility/makefile.mk | 4 | ||||
-rw-r--r-- | l10ntools/source/export2.cxx | 2 | ||||
-rw-r--r-- | l10ntools/source/filter/merge/makefile.mk | 2 | ||||
-rw-r--r-- | l10ntools/source/gsicheck.cxx | 2 | ||||
-rw-r--r-- | l10ntools/source/gsiconv.cxx | 2 | ||||
-rw-r--r-- | l10ntools/source/help/HelpLinker.cxx | 4 | ||||
-rw-r--r-- | l10ntools/source/helpex.cxx | 2 | ||||
-rw-r--r-- | l10ntools/source/helpmerge.cxx | 8 | ||||
-rw-r--r-- | l10ntools/source/lngex.cxx | 2 | ||||
-rw-r--r-- | l10ntools/source/localize.cxx | 6 | ||||
-rw-r--r-- | l10ntools/source/tagtest.cxx | 3 | ||||
-rw-r--r-- | l10ntools/source/xgfconv.cxx | 2 |
17 files changed, 16 insertions, 56 deletions
diff --git a/basegfx/util/makefile.mk b/basegfx/util/makefile.mk index 4d5d92ce7551..777f30aba696 100644 --- a/basegfx/util/makefile.mk +++ b/basegfx/util/makefile.mk @@ -52,9 +52,6 @@ LIB1FILES=\ $(SLB)$/raster.lib SHL1TARGET= basegfx$(DLLPOSTFIX) -.IF "$(GUI)" == "OS2" -SHL1TARGET= bgfx -.ENDIF SHL1IMPLIB= ibasegfx SHL1STDLIBS=\ diff --git a/i18npool/source/isolang/insys.cxx b/i18npool/source/isolang/insys.cxx index 4432a0923a0d..fac39e1f2689 100644 --- a/i18npool/source/isolang/insys.cxx +++ b/i18npool/source/isolang/insys.cxx @@ -33,7 +33,7 @@ #include "inwnt.cxx" -#elif defined( UNX ) || defined( OS2 ) +#elif defined( UNX ) #include "inunx.cxx" diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk index ddf597d780d7..56a36747d5a6 100644 --- a/i18npool/source/localedata/data/makefile.mk +++ b/i18npool/source/localedata/data/makefile.mk @@ -29,9 +29,6 @@ PRJ=..$/..$/.. PRJNAME=i18npool TARGET=localedata -.IF "$(GUI)" == "OS2" -TARGET=ld -.ENDIF LIBTARGET=NO # Disable debugging on MSC compilers, due linker bug @@ -60,10 +57,6 @@ LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET) LINK_LOCALEDATA_EN_LIB=$(LB)$/i$(SHL1TARGET).lib LINK_LOCALEDATA_ES_LIB=$(LB)$/i$(SHL2TARGET).lib .ENDIF -.ELIF "$(GUI)" == "OS2" -LINK_LOCALEDATA_EN_LIB=$(LB)$/i$(SHL1TARGET).lib -LINK_LOCALEDATA_ES_LIB=$(LB)$/i$(SHL2TARGET).lib -.ELSE LINK_LOCALEDATA_EN_LIB=-l$(SHL1TARGET) LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET) .ENDIF @@ -72,9 +65,6 @@ LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET) # English Locales SHL1TARGET=localedata_en -.IF "$(GUI)" == "OS2" -SHL1TARGET=ld_en -.ENDIF SHL1IMPLIB=i$(SHL1TARGET) SHL1VERSIONMAP=localedata_en.map @@ -102,9 +92,6 @@ LIB1OBJFILES=$(SHL1OBJS) # Spanish Locales SHL2TARGET=localedata_es -.IF "$(GUI)" == "OS2" -SHL2TARGET=ld_es -.ENDIF SHL2IMPLIB=i$(SHL2TARGET) SHL2VERSIONMAP=localedata_es.map @@ -140,9 +127,6 @@ LIB2OBJFILES=$(SHL2OBJS) # European Locales SHL3TARGET=localedata_euro -.IF "$(GUI)" == "OS2" -SHL3TARGET=ld_eur -.ENDIF SHL3IMPLIB=i$(SHL3TARGET) SHL3VERSIONMAP=localedata_euro.map @@ -229,9 +213,6 @@ LIB3OBJFILES=$(SHL3OBJS) # Other Locales SHL4TARGET=localedata_others -.IF "$(GUI)" == "OS2" -SHL4TARGET=ld_oth -.ENDIF SHL4IMPLIB=i$(SHL4TARGET) SHL4VERSIONMAP=localedata_others.map diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 64f5c975374b..5c04a124bf24 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -52,17 +52,10 @@ typedef sal_Unicode*** (SAL_CALL * MyFunc_Type2)( sal_Int16&, sal_Int16& ); typedef sal_Unicode**** (SAL_CALL * MyFunc_Type3)( sal_Int16&, sal_Int16&, sal_Int16& ); typedef sal_Unicode const * const * (SAL_CALL * MyFunc_FormatCode)( sal_Int16&, sal_Unicode const *&, sal_Unicode const *& ); -#ifdef OS2 // YD 8.3!! -static const char *lcl_DATA_EN = "ld_en"; -static const char *lcl_DATA_ES = "ld_es"; -static const char *lcl_DATA_EURO = "ld_eur"; -static const char *lcl_DATA_OTHERS = "ld_oth"; -#else static const char *lcl_DATA_EN = "localedata_en"; static const char *lcl_DATA_ES = "localedata_es"; static const char *lcl_DATA_EURO = "localedata_euro"; static const char *lcl_DATA_OTHERS = "localedata_others"; -#endif static const struct { const char* pLocale; diff --git a/i18npool/source/search/makefile.mk b/i18npool/source/search/makefile.mk index 372b32a216d1..ba47813a68c4 100644 --- a/i18npool/source/search/makefile.mk +++ b/i18npool/source/search/makefile.mk @@ -55,7 +55,7 @@ EXCEPTIONSNOOPTFILES= \ SHL1TARGET= $(TARGET) SHL1OBJS= $(SLOFILES) -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") I18NREGEXPLIB=-li18nregexp$(COMID) .ELSE I18NREGEXPLIB=ii18nregexp.lib diff --git a/i18nutil/source/utility/makefile.mk b/i18nutil/source/utility/makefile.mk index b38084309af4..adfddd91db2d 100644 --- a/i18nutil/source/utility/makefile.mk +++ b/i18nutil/source/utility/makefile.mk @@ -46,11 +46,7 @@ SLOFILES= \ $(SLO)$/oneToOneMapping.obj # Unicode utilities -.IF "$(GUI)" == "OS2" -SHL1TARGET= $(TARGET) -.ELSE SHL1TARGET= $(TARGET)$(COMID) -.ENDIF SHL1IMPLIB= i$(TARGET) DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx index 5659123304c8..6e6a6d118323 100644 --- a/l10ntools/source/export2.cxx +++ b/l10ntools/source/export2.cxx @@ -690,7 +690,7 @@ DirEntry Export::GetTempFile() String sDecodedStr = INetURLObject::decode( strTmp , '%' , eMechanism ); ByteString sTmp( sDecodedStr , RTL_TEXTENCODING_UTF8 ); -#if defined(WNT) || defined(OS2) +#if defined(WNT) sTmp.SearchAndReplace("file:///",""); sTmp.SearchAndReplaceAll('/','\\'); #else diff --git a/l10ntools/source/filter/merge/makefile.mk b/l10ntools/source/filter/merge/makefile.mk index b66e5b27e6a1..8ef73debd743 100644 --- a/l10ntools/source/filter/merge/makefile.mk +++ b/l10ntools/source/filter/merge/makefile.mk @@ -65,7 +65,7 @@ JARCOMPRESS = TRUE .INCLUDE : target.mk -.IF "$(SOLAR_JAVA)" != "" || "$(GUI)"=="OS2" +.IF "$(SOLAR_JAVA)" != "" ALLTAR : $(OWNCOPY) .IF "$(JARTARGETN)" != "" diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx index 7c5c0b9bef40..89fb66775d54 100644 --- a/l10ntools/source/gsicheck.cxx +++ b/l10ntools/source/gsicheck.cxx @@ -775,7 +775,7 @@ void Help() } /*****************************************************************************/ -#if defined(UNX) || defined(OS2) +#if defined(UNX) int main( int argc, char *argv[] ) #else int _cdecl main( int argc, char *argv[] ) diff --git a/l10ntools/source/gsiconv.cxx b/l10ntools/source/gsiconv.cxx index 7fd345b6e3aa..06d203d1fb21 100644 --- a/l10ntools/source/gsiconv.cxx +++ b/l10ntools/source/gsiconv.cxx @@ -199,7 +199,7 @@ void Help() } /*****************************************************************************/ -#if defined(UNX) || defined(OS2) +#if defined(UNX) int main( int argc, char *argv[] ) #else int _cdecl main( int argc, char *argv[] ) diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx index 4bcdef565e90..81a96ce37899 100644 --- a/l10ntools/source/help/HelpLinker.cxx +++ b/l10ntools/source/help/HelpLinker.cxx @@ -486,10 +486,8 @@ void HelpLinker::link() throw( HelpProcessingException ) if( !bExtensionMode ) { -#ifndef OS2 // YD @TODO@ crashes libc runtime :-( std::cout << "Making " << outputFile.native_file_string() << " from " << helpFiles.size() << " input files" << std::endl; -#endif } // here we start our loop over the hzip files. @@ -1060,9 +1058,7 @@ int main(int argc, char**argv) exit(1); } sal_uInt32 endtime = osl_getGlobalTimer(); -#ifndef OS2 // YD @TODO@ crashes libc runtime :-( std::cout << "time taken was " << (endtime-starttime)/1000.0 << " seconds" << std::endl; -#endif return 0; } diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx index 74d183185cfa..e67f9793b899 100644 --- a/l10ntools/source/helpex.cxx +++ b/l10ntools/source/helpex.cxx @@ -201,7 +201,7 @@ void Help() /*****************************************************************************/ #ifndef TESTDRIVER -#if defined(UNX) || defined(OS2) +#if defined(UNX) int main( int argc, char *argv[] ) #else int _cdecl main( int argc, char *argv[] ) diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index a0032bc2558b..1905b7a9b2be 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -470,7 +470,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile if( !Export::CopyFile( sTempFile , sTempFileCopy ) ) { -#if defined(UNX) || defined(OS2) +#if defined(UNX) sleep( 3 ); #else Sleep( 3 ); @@ -488,7 +488,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile remove( sTargetFile.GetBuffer() ); } int rc; -#if defined(UNX) || defined(OS2) +#if defined(UNX) rc = rename( sTempFile.GetBuffer() , sTargetFile.GetBuffer() ); #else rc = MoveFileEx( sTempFile.GetBuffer() , sTargetFile.GetBuffer(), MOVEFILE_REPLACE_EXISTING ); @@ -504,7 +504,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile // if( aFS.GetSize() < 1 ) //#endif { -#if defined(UNX) || defined(OS2) +#if defined(UNX) sleep( 3 ); #else Sleep( 3 ); @@ -514,7 +514,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile { remove( sTargetFile.GetBuffer() ); } -#if defined(UNX) || defined(OS2) +#if defined(UNX) rc = rename( sTempFileCopy.GetBuffer() , sTargetFile.GetBuffer() ); #else rc = MoveFileEx( sTempFileCopy.GetBuffer() , sTargetFile.GetBuffer() , MOVEFILE_REPLACE_EXISTING ); diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx index 723b54d21e01..f9c286f43b25 100644 --- a/l10ntools/source/lngex.cxx +++ b/l10ntools/source/lngex.cxx @@ -171,7 +171,7 @@ void Help() } /*****************************************************************************/ -#if defined(UNX) || defined(OS2) +#if defined(UNX) int main( int argc, char *argv[] ) #else int _cdecl main( int argc, char *argv[] ) diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index fd49cadf256f..c6c38aa1850f 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -346,7 +346,7 @@ void SourceTreeLocalizer::WorkOnFile( ByteString sTempFile( aTemp.GetFull(), RTL_TEXTENCODING_ASCII_US ); ByteString sDel; -#if defined(WNT) || defined(OS2) +#if defined(WNT) sDel=ByteString("\\"); #else sDel=ByteString("/"); @@ -355,7 +355,7 @@ void SourceTreeLocalizer::WorkOnFile( ByteString sPath2( Export::GetEnv("INPATH") ); ByteString sPath3( "bin" ); ByteString sExecutable( sPath1 ); -#if defined(WNT) || defined(OS2) +#if defined(WNT) sExecutable.SearchAndReplaceAll( "/", sDel ); #endif sExecutable += sDel ; @@ -876,7 +876,7 @@ sal_Bool CheckLanguages( ByteString &rLanguages ) } /*****************************************************************************/ -#if defined(UNX) || defined(OS2) +#if defined(UNX) int main( int argc, char *argv[] ) #else int _cdecl main( int argc, char *argv[] ) diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx index 65bd70a32ef4..c3706aa4cd30 100644 --- a/l10ntools/source/tagtest.cxx +++ b/l10ntools/source/tagtest.cxx @@ -953,7 +953,6 @@ void TokenParser::Paragraph() Paragraph(); } break; - case TAG_OS2: case TAG_WIN: case TAG_UNIX: case TAG_MAC: //... @@ -1016,7 +1015,6 @@ void TokenParser::PfCase() CaseEnd(); } break; - case TAG_OS2: case TAG_WIN: case TAG_UNIX: case TAG_MAC: //First (PfBegin) @@ -1035,7 +1033,6 @@ void TokenParser::PfCaseBegin() { switch ( aTag.nId ) { - case TAG_OS2: case TAG_WIN: case TAG_UNIX: case TAG_MAC: diff --git a/l10ntools/source/xgfconv.cxx b/l10ntools/source/xgfconv.cxx index 211ea3cad402..82d928b33008 100644 --- a/l10ntools/source/xgfconv.cxx +++ b/l10ntools/source/xgfconv.cxx @@ -8,7 +8,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_l10ntools.hxx" -#if defined(UNX) || defined(OS2) +#if defined(UNX) int main( int argc, char *argv[] ) #else int _cdecl main( int argc, char *argv[] ) |