diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-04-16 09:08:29 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-04-18 16:59:48 +0200 |
| commit | 35e1b53c7e6176315257cae9434ec4364262282c (patch) | |
| tree | 32c349e5d26d2e4475af8ae260bdc29ca4dd17f3 /codemaker | |
| parent | be6061a954b5f55b20d0e58aa12b425b6505f56e (diff) | |
Remove OS/2 support.
Diffstat (limited to 'codemaker')
| -rwxr-xr-x | codemaker/codemaker.pmk | 6 | ||||
| -rw-r--r-- | codemaker/source/codemaker/global.cxx | 4 | ||||
| -rw-r--r-- | codemaker/source/codemaker/makefile.mk | 2 | ||||
| -rw-r--r-- | codemaker/source/cppumaker/cpputype.cxx | 4 |
4 files changed, 3 insertions, 13 deletions
diff --git a/codemaker/codemaker.pmk b/codemaker/codemaker.pmk index 976c162e71b3..cf06407ea8d8 100755 --- a/codemaker/codemaker.pmk +++ b/codemaker/codemaker.pmk @@ -25,11 +25,7 @@ # #************************************************************************* -.IF "$(GUI)" == "OS2" -STL_OS2_BUILDING=1 -.ENDIF - -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" CODEMAKERLIBDEPN=codemaker.lib COMMONCPPLIBDEPN=commoncpp.lib COMMONJAVALIBDEPN=commonjava.lib diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx index 52e4e3486aa6..7d3faa98121a 100644 --- a/codemaker/source/codemaker/global.cxx +++ b/codemaker/source/codemaker/global.cxx @@ -35,7 +35,7 @@ #include "osl/file.hxx" #include <string.h> -#if defined(SAL_W32) || defined(SAL_OS2) +#if defined(SAL_W32) #include <io.h> #include <direct.h> @@ -152,7 +152,7 @@ OString createFileNameFromType( const OString& destination, continue; } -#if defined(SAL_UNX) || defined(SAL_OS2) +#if defined(SAL_UNX) if (mkdir((char*)nameBuffer.getStr(), 0777) == -1) #else if (mkdir((char*)nameBuffer.getStr()) == -1) diff --git a/codemaker/source/codemaker/makefile.mk b/codemaker/source/codemaker/makefile.mk index 515d3657969e..fb458fb6f61c 100644 --- a/codemaker/source/codemaker/makefile.mk +++ b/codemaker/source/codemaker/makefile.mk @@ -43,9 +43,7 @@ SLOFILES = \ $(SLO)$/codemaker.obj LIB1TARGET=$(LB)$/$(TARGET).lib -.IF "$(GUI)" != "OS2" LIB1ARCHIV=$(LB)$/lib$(TARGET).a -.ENDIF LIB1OBJFILES=$(SLOFILES) .INCLUDE: target.mk diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index 735591f1a476..4ec13e63c9f8 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -2370,8 +2370,6 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o) { o << "\n#ifdef SAL_W32\n" << "# pragma pack(push, 8)\n" - << "#elif defined(SAL_OS2)\n" - << "# pragma pack(8)\n" << "#endif\n\n"; OSL_ASSERT(!isPolymorphic() || m_reader.getSuperTypeCount() == 0); //TODO @@ -2448,8 +2446,6 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o) o << "#ifdef SAL_W32\n" << "# pragma pack(pop)\n" - << "#elif defined(SAL_OS2)\n" - << "# pragma pack()\n" << "#endif\n\n"; return sal_True; |