diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:53:38 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:53:38 +0000 |
| commit | d43e30a6ddbfe360fd7da8c33dc86f6efd153777 (patch) | |
| tree | 749ec9b3c5ad71813e7b49a68999dd9b9fd8426d | |
| parent | 25ad1c9b808fec7e8da068bb9456997ad60241fa (diff) | |
INTEGRATION: CWS dmake411 (1.3.2); FILE MERGED
2007/09/22 23:05:38 vq 1.3.2.1: #i81855# Clean-up merge from CWS os2port01.
| -rw-r--r-- | dmake/unix/dirbrk.c | 4 | ||||
| -rw-r--r-- | dmake/unix/sysintf.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/dmake/unix/dirbrk.c b/dmake/unix/dirbrk.c index 4bbf58c9eca3..3032a58d4e96 100644 --- a/dmake/unix/dirbrk.c +++ b/dmake/unix/dirbrk.c @@ -1,4 +1,4 @@ -/* RCS $Id: dirbrk.c,v 1.3 2007-09-20 14:35:04 vg Exp $ +/* RCS $Id: dirbrk.c,v 1.4 2007-10-15 15:52:59 ihi Exp $ -- -- SYNOPSIS -- Define the directory separator string. @@ -29,6 +29,8 @@ #ifdef __EMX__ /* os2 uses /, \, and : */ +/* FIXME: The OS/2 port most probably wants to use the HAVE_DRIVE_LETTERS + * macro, see extern.h. */ char* DirBrkStr = "/\\:"; #else /* Unix only uses / */ diff --git a/dmake/unix/sysintf.h b/dmake/unix/sysintf.h index de75381b120b..85bd198529e8 100644 --- a/dmake/unix/sysintf.h +++ b/dmake/unix/sysintf.h @@ -1,4 +1,4 @@ -/* RCS $Id: sysintf.h,v 1.3 2007-09-20 14:35:41 vg Exp $ +/* RCS $Id: sysintf.h,v 1.4 2007-10-15 15:53:38 ihi Exp $ -- -- SYNOPSIS -- Interfaces for sysintf.c @@ -27,9 +27,6 @@ #define VOID_LCACHE(l,m) (void) void_lcache(l,m) #define Hook_std_writes(A) #define GETPID getpid() -#ifdef __EMX__ -#define CacheStat(A,B) really_dostat(A,&buf) -#endif #ifndef S_IFDIR #define S_IFDIR 0040000 |