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 /idlc | |
parent | be6061a954b5f55b20d0e58aa12b425b6505f56e (diff) |
Remove OS/2 support.
Diffstat (limited to 'idlc')
-rw-r--r-- | idlc/source/idlccompile.cxx | 21 | ||||
-rw-r--r-- | idlc/source/idlcproduce.cxx | 4 | ||||
-rw-r--r-- | idlc/source/makefile.mk | 4 | ||||
-rw-r--r-- | idlc/source/preproc/include.c | 4 | ||||
-rw-r--r-- | idlc/source/preproc/macro.c | 4 |
5 files changed, 5 insertions, 32 deletions
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 9bc69b148f1c..e660a0087972 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -36,7 +36,7 @@ #include <osl/thread.h> #include <osl/file.hxx> -#if defined(SAL_W32) || defined(SAL_OS2) +#if defined(SAL_W32) #include <io.h> #endif @@ -150,7 +150,7 @@ OString makeTempName(const OString& prefix) if ( uTmpPath.getLength() ) tmpPath = OUStringToOString(uTmpPath, RTL_TEXTENCODING_UTF8); -#if defined(SAL_W32) || defined(SAL_UNX) || defined(SAL_OS2) +#if defined(SAL_W32) || defined(SAL_UNX) OSL_ASSERT( sizeof(tmpFilePattern) > ( strlen(tmpPath) + RTL_CONSTASCII_LENGTH( @@ -300,22 +300,7 @@ sal_Int32 compileFile(const OString * pathname) idlc()->getOptions()->getProgramName().getStr(), cmdFileName.getStr()); exit(99); } -#ifdef SAL_OS2_00 - char* tok = strtok( (char*)cppArgs.getStr(), " \t\n\r"); - while( tok) { - if (tok[strlen(tok)-1] == '\"') - tok[strlen(tok)-1] = '\0'; - if (*tok == '\"') - memcpy( tok, tok+1, strlen(tok)); - if (strlen(tok)>0) { - fputs(tok, pCmdFile); - fputc('\n', pCmdFile); - } - tok = strtok( NULL, " \t\n\r"); - } -#else fprintf(pCmdFile, "%s", cppArgs.getStr()); -#endif fclose(pCmdFile); OUString cmdArg(RTL_CONSTASCII_USTRINGPARAM("@")); @@ -330,7 +315,7 @@ sal_Int32 compileFile(const OString * pathname) sal_Int32 idx= cpp.lastIndexOf(OUString( RTL_CONSTASCII_USTRINGPARAM("idlc")) ); cpp = cpp.copy(0, idx); -#if defined(SAL_W32) || defined(SAL_OS2) +#if defined(SAL_W32) cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("idlcpp.exe")); #else cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("idlcpp")); diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx index f97357a4e500..a65f3317487a 100644 --- a/idlc/source/idlcproduce.cxx +++ b/idlc/source/idlcproduce.cxx @@ -34,7 +34,7 @@ #include <osl/file.hxx> #include <osl/thread.h> -#if defined(SAL_W32) || defined(SAL_OS2) +#if defined(SAL_W32) #include <io.h> #include <direct.h> #include <errno.h> @@ -80,7 +80,7 @@ static sal_Bool checkOutputPath(const OString& completeName) if ( buffer.getLength() > 0 && nIndex != -1 ) { -#if defined(SAL_UNX) || defined(SAL_OS2) +#if defined(SAL_UNX) if (mkdir((char*)buffer.getStr(), 0777) == -1) #else if (mkdir((char*)buffer.getStr()) == -1) diff --git a/idlc/source/makefile.mk b/idlc/source/makefile.mk index 879090d15b54..33a1c9de1884 100644 --- a/idlc/source/makefile.mk +++ b/idlc/source/makefile.mk @@ -35,10 +35,6 @@ LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE INCPRE=$(MISC) -.IF "$(GUI)" == "OS2" -STL_OS2_BUILDING=1 -.ENDIF - # --- Settings ----------------------------------------------------- diff --git a/idlc/source/preproc/include.c b/idlc/source/preproc/include.c index e00156b13bcb..87c879afa9e4 100644 --- a/idlc/source/preproc/include.c +++ b/idlc/source/preproc/include.c @@ -47,11 +47,7 @@ Wraplist wraplist[NINCLUDE]; void doinclude(Tokenrow * trp, int depth, int import) { -#ifdef OS2 - char fname[_MAX_PATH], iname[_MAX_PATH]; -#else char fname[PATH_MAX], iname[PATH_MAX]; -#endif Includelist *ip; int angled, len, fd, i; diff --git a/idlc/source/preproc/macro.c b/idlc/source/preproc/macro.c index e30459958564..5258fa23b2a1 100644 --- a/idlc/source/preproc/macro.c +++ b/idlc/source/preproc/macro.c @@ -47,11 +47,7 @@ void Nlist *np; Source *s; Tokenrow *def, *args; -#ifdef OS2 - static uchar location[(_MAX_PATH + 8) * NINC], *cp; -#else static uchar location[(PATH_MAX + 8) * NINC], *cp; -#endif tp = trp->tp + 1; if (tp >= trp->lp || tp->type != NAME) { |