summaryrefslogtreecommitdiff
path: root/i18npool
diff options
context:
space:
mode:
Diffstat (limited to 'i18npool')
-rw-r--r--i18npool/source/isolang/insys.cxx2
-rw-r--r--i18npool/source/localedata/data/makefile.mk19
-rw-r--r--i18npool/source/localedata/localedata.cxx7
-rw-r--r--i18npool/source/search/makefile.mk2
4 files changed, 2 insertions, 28 deletions
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