diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-15 13:36:58 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-15 14:08:09 +0300 |
| commit | 20ba3c4ae8053079bc5ec134c4c60a3aa33b5ad7 (patch) | |
| tree | 11bda8adc750e2bc15f377512d34e8215f507881 /soltools | |
| parent | 1b7717c24244aafbb314dcf4fca2efc901fd1393 (diff) | |
Kill OS/2 stuff
Diffstat (limited to 'soltools')
| -rw-r--r-- | soltools/cpp/makefile.mk | 2 | ||||
| -rw-r--r-- | soltools/giparser/makefile.mk | 4 | ||||
| -rw-r--r-- | soltools/javadep/javadep.c | 12 | ||||
| -rw-r--r-- | soltools/ldump/ldump.cxx | 8 | ||||
| -rw-r--r-- | soltools/ldump/makefile.mk | 2 |
5 files changed, 5 insertions, 23 deletions
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk index 71c581a38325..44db211b6f53 100644 --- a/soltools/cpp/makefile.mk +++ b/soltools/cpp/makefile.mk @@ -63,9 +63,7 @@ CDEFS += -DHAVE_GETOPT .ENDIF APP1TARGET = $(TARGET) -.IF "$(GUI)" != "OS2" APP1STACK = 1000000 -.ENDIF APP1LIBS = $(LB)$/$(TARGET).lib APP1DEPN = $(LB)$/$(TARGET).lib diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk index bab26d2e7e1b..a463f5a55569 100644 --- a/soltools/giparser/makefile.mk +++ b/soltools/giparser/makefile.mk @@ -32,10 +32,6 @@ TARGET=soltools_giparser TARGETTYPE=CUI ENABLE_EXCEPTIONS=TRUE -.IF "$(GUI)" == "OS2" -STL_OS2_BUILDING=1 -.ENDIF - # --- Settings ----------------------------------------------------- .INCLUDE : $(PRJ)$/util$/makefile.pmk diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c index 86032c7f7cc9..351177a76c6c 100644 --- a/soltools/javadep/javadep.c +++ b/soltools/javadep/javadep.c @@ -39,7 +39,7 @@ #include <ctype.h> #include <limits.h> -#if defined(UNX) || defined(OS2) +#if defined(UNX) #include <unistd.h> #include <netinet/in.h> /* ntohl(), ntohs() */ #elif defined(WNT) @@ -55,10 +55,6 @@ #define ntohs(x) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) #endif -#if defined(OS2) -#define CDECL -#endif - /* max. length of line in response file */ #define RES_FILE_BUF 65536 @@ -105,10 +101,10 @@ enum { NGROW_INIT = 10, NGROW = 2 }; static char *pprogname = "javadep"; static char csep = ';'; -#if defined (UNX) || defined(OS2) +#if defined (UNX) #define CDECL static char cpathsep = '/'; -#elif defined (WNT) || defined(OS2) +#elif defined (WNT) static char cpathsep = '\\'; #endif static FILE *pfsout = NULL; @@ -302,7 +298,7 @@ add_to_dependencies(struct growable *pdep, } /* get the canonical path */ -#if defined (UNX) || defined(OS2) +#if defined (UNX) if ( !(realpath(pclass_file, cnp_class_file) && realpath(path, cnp_str) ) ) { err_quit("can't get the canonical path"); diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx index ebe6983e18be..d8dab54b2390 100644 --- a/soltools/ldump/ldump.cxx +++ b/soltools/ldump/ldump.cxx @@ -542,17 +542,9 @@ bool LibDump::CheckDataBase() char *pTmp = "defs\\"; FILE *fp; -#ifdef OS2 - _mkdir ("defs", 0777); -#else _mkdir ("defs"); -#endif strcpy(cBName,pTmp); -#ifdef OS2 - strcat(cBName,"gcc"); -#else strcat(cBName,getenv ("COMP_ENV")); -#endif fp = fopen (cBName,"r"); if (fp) diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk index 51ff42e60772..6d0eda3bf99e 100644 --- a/soltools/ldump/makefile.mk +++ b/soltools/ldump/makefile.mk @@ -42,7 +42,7 @@ LIBSALCPPRT=$(0) # --- Files -------------------------------------------------------- # ldump only supports windows environment -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" #ldump4 reimplements feature set of ldump2 and ldump3 APP1TARGET= ldump4 |