diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-06-12 07:17:09 +0200 |
|---|---|---|
| committer | Francois Tigeot <ftigeot@wolfpond.org> | 2011-06-12 07:18:48 +0200 |
| commit | 9a7c5c77859c440b6f5ccf4798a4423abf3b001e (patch) | |
| tree | 8c611ff43f121df2d818f096b4079a0713b788de | |
| parent | Typo (diff) | |
| download | core-9a7c5c77859c440b6f5ccf4798a4423abf3b001e.tar.gz core-9a7c5c77859c440b6f5ccf4798a4423abf3b001e.zip | |
Remove some OS/2 remnants
| -rw-r--r-- | soltools/mkdepend/main.c | 8 | ||||
| -rw-r--r-- | soltools/testSHL/testshl.cxx | 2 | ||||
| -rw-r--r-- | stlport/makefile.mk | 7 |
3 files changed, 5 insertions, 12 deletions
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index 441f986f399e..6b0fe3df69a9 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -148,7 +148,7 @@ catch (sig) fatalerr ("got signal %d\n", sig); } -#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(OS2) || defined(Lynx_22) +#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(Lynx_22) #define USGISH #endif @@ -691,12 +691,12 @@ void redirect(line, makefile) fatalerr("cannot open \"%s\"\n", makefile); sprintf(backup, "%s.bak", makefile); unlink(backup); -#if defined(WIN32) || defined(OS2) +#if defined(WIN32) fclose(fdin); #endif if (rename(makefile, backup) < 0) fatalerr("cannot rename %s to %s\n", makefile, backup); -#if defined(WIN32) || defined(OS2) +#if defined(WIN32) if ((fdin = fopen(backup, "r")) == NULL) fatalerr("cannot open \"%s\"\n", backup); #endif @@ -765,7 +765,7 @@ void warning1(char *msg, ...) void convert_slashes(path) char* path; { -#if defined (WNT) || defined(OS2) +#if defined (WNT) /* * Convert backslashes to slashes */ diff --git a/soltools/testSHL/testshl.cxx b/soltools/testSHL/testshl.cxx index 15ca5fedda95..c66a238effa6 100644 --- a/soltools/testSHL/testshl.cxx +++ b/soltools/testSHL/testshl.cxx @@ -40,7 +40,7 @@ using namespace tstutl; void usage(); void test_shl( vector< sal_Char* > cmdln, sal_Bool boom ); -#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/stlport/makefile.mk b/stlport/makefile.mk index 06f0e88094d9..9211a5e117fd 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -101,8 +101,6 @@ BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER) # FreeBSD needs a special makefile .IF "$(OS)"=="FREEBSD" BUILD_FLAGS=-f gcc-3.0-freebsd.mak - .ELIF "$(OS)"=="OS2" - BUILD_FLAGS=-f gcc-3.0-os2.mak .ELIF "$(GUI)"=="WNT" BUILD_FLAGS=-f gcc-3.0-mingw.mak .ELSE @@ -164,11 +162,6 @@ OUT2BIN= \ .ENDIF # "$(COM)"=="GCC" -.ELIF "$(GUI)"=="OS2" - -OUT2LIB= lib$/*.lib -OUT2BIN= lib$/*.dll - .ELSE # "$(GUI)"=="WNT" OUT2LIB= \ |