diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:24:34 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:24:34 +0000 |
| commit | 30b19b875b8a815134fe3528e9ab9cd3ec348240 (patch) | |
| tree | bcb9ea61be4aae8c823089538a3800e5c07c8fcf /soltools | |
| parent | 25eb38b8fa36a2795543a5374e00ceaa8b6b6944 (diff) | |
INTEGRATION: CWS os2port03 (1.11.12); FILE MERGED
2008/07/16 12:39:23 obr 1.11.12.2: RESYNC: (1.11-1.12); FILE MERGED
2008/01/14 16:37:54 ydario 1.11.12.1: use OS2 instead of __EMX__
Issue number:i85203
Submitted by:ydario
Diffstat (limited to 'soltools')
| -rw-r--r-- | soltools/mkdepend/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index f103a6e55e80..082feb90448e 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -146,7 +146,7 @@ catch (sig) fatalerr ("got signal %d\n", sig); } -#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(__EMX__) || defined(Lynx_22) +#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(OS2) || defined(Lynx_22) #define USGISH #endif @@ -639,7 +639,7 @@ char *base_name(file) return(file); } -#if defined(USG) && !defined(CRAY) && !defined(SVR4) && !defined(__EMX__) +#if defined(USG) && !defined(CRAY) && !defined(SVR4) int rename (from, to) char *from, *to; { @@ -687,12 +687,12 @@ void redirect(line, makefile) fatalerr("cannot open \"%s\"\n", makefile); sprintf(backup, "%s.bak", makefile); unlink(backup); -#if defined(WIN32) || defined(__EMX__) +#if defined(WIN32) || defined(OS2) fclose(fdin); #endif if (rename(makefile, backup) < 0) fatalerr("cannot rename %s to %s\n", makefile, backup); -#if defined(WIN32) || defined(__EMX__) +#if defined(WIN32) || defined(OS2) if ((fdin = fopen(backup, "r")) == NULL) fatalerr("cannot open \"%s\"\n", backup); #endif @@ -791,7 +791,7 @@ void warning1(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9) void convert_slashes(path) char* path; { -#if defined (WNT) +#if defined (WNT) || defined(OS2) /* * Convert backslashes to slashes */ |