diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-09-10 22:44:47 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-09-10 22:44:47 +0000 |
| commit | ed6179beb2ea5e67c2a43010b2edcd1f8094b7e8 (patch) | |
| tree | 377e49a7c5fdd02bc13a2a7340b3ac38c54a14b6 | |
| parent | 94f49df4a163f2516b3302e156588da4685c1be6 (diff) | |
CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
| -rw-r--r-- | extensions/source/oooimprovecore/makefile.mk | 3 | ||||
| -rw-r--r-- | extensions/source/oooimprovement/errormail.cxx | 6 | ||||
| -rw-r--r-- | extensions/source/oooimprovement/makefile.mk | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/extensions/source/oooimprovecore/makefile.mk b/extensions/source/oooimprovecore/makefile.mk index 74a9ad9aee19..b527f16bf44e 100644 --- a/extensions/source/oooimprovecore/makefile.mk +++ b/extensions/source/oooimprovecore/makefile.mk @@ -52,6 +52,9 @@ LIB1FILES= \ $(SLB)$/$(TARGET).lib \ SHL1TARGET=$(TARGET)$(DLLPOSTFIX) +.IF "$(GUI)"=="OS2" +SHL1TARGET=oooimpc$(DLLPOSTFIX) +.ENDIF SHL1STDLIBS= \ $(COMPHELPERLIB) \ diff --git a/extensions/source/oooimprovement/errormail.cxx b/extensions/source/oooimprovement/errormail.cxx index fdfec120695f..38e863750220 100644 --- a/extensions/source/oooimprovement/errormail.cxx +++ b/extensions/source/oooimprovement/errormail.cxx @@ -37,7 +37,7 @@ #include <rtl/string.hxx> #include <rtl/strbuf.hxx> -#ifdef UNIX +#if defined(UNIX) || defined(OS2) #include <sys/utsname.h> #endif #ifdef WIN32 @@ -83,12 +83,14 @@ namespace { return "Win32"; #elif defined UNIX return "Unix"; + #elif defined OS2 + return "OS/2"; #else return "Unknown"; #endif }; -#ifdef UNIX +#if defined(UNIX) || defined(OS2) static const OString getLocale() { const char * locale = getenv( "LC_ALL" ); diff --git a/extensions/source/oooimprovement/makefile.mk b/extensions/source/oooimprovement/makefile.mk index 41f91fc7b5ca..f9b508b13f2f 100644 --- a/extensions/source/oooimprovement/makefile.mk +++ b/extensions/source/oooimprovement/makefile.mk @@ -70,6 +70,10 @@ SHL1STDLIBS= \ $(UNOTOOLSLIB) \ SHL1TARGET= $(TARGET)$(DLLPOSTFIX) +.IF "$(GUI)"=="OS2" +SHL1TARGET= oooimp$(DLLPOSTFIX) +.ENDIF + SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) |