diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:36:44 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:36:44 +0000 |
| commit | 7d8addda8a30d99df8da36acba3f035ac25b180d (patch) | |
| tree | ae71d78ffb372788d4953e42c1b7aeec0aaca931 /dmake | |
| parent | 6d0978319e2f5bd9dd37982612cdcab861ae5279 (diff) | |
INTEGRATION: CWS dmake412_DEV300 (1.1.1.1.176); FILE MERGED
2007/11/11 00:03:32 vq 1.1.1.1.176.1: #i83523# Rename macro PVOID to DMPVOID to avoid problems when including
windows.h.
Diffstat (limited to 'dmake')
| -rw-r--r-- | dmake/msdos/borland/bcc30/config.h | 4 | ||||
| -rw-r--r-- | dmake/msdos/borland/bcc40/config.h | 4 | ||||
| -rw-r--r-- | dmake/msdos/borland/bcc45/config.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/dmake/msdos/borland/bcc30/config.h b/dmake/msdos/borland/bcc30/config.h index 8e02779edd75..3db5098145fa 100644 --- a/dmake/msdos/borland/bcc30/config.h +++ b/dmake/msdos/borland/bcc30/config.h @@ -1,4 +1,4 @@ -/* RCS $Id: config.h,v 1.1.1.1 2000-09-22 15:33:28 hr Exp $ +/* RCS $Id: config.h,v 1.2 2008-03-05 18:36:08 kz Exp $ -- -- SYNOPSIS -- Configurarion include file. @@ -42,7 +42,7 @@ extern unsigned int coreleft(); #endif /* a small problem with pointer to voids on some unix machines needs this */ -#define PVOID void * +#define DMPVOID void * /* Have to pull this in for the standard lib defines */ #include <io.h> diff --git a/dmake/msdos/borland/bcc40/config.h b/dmake/msdos/borland/bcc40/config.h index 994a10eab1ba..3a9b58383498 100644 --- a/dmake/msdos/borland/bcc40/config.h +++ b/dmake/msdos/borland/bcc40/config.h @@ -1,4 +1,4 @@ -/* RCS $Id: config.h,v 1.1.1.1 2000-09-22 15:33:28 hr Exp $ +/* RCS $Id: config.h,v 1.2 2008-03-05 18:36:30 kz Exp $ -- -- SYNOPSIS -- Configurarion include file. @@ -42,7 +42,7 @@ extern unsigned int coreleft(); #endif /* a small problem with pointer to voids on some unix machines needs this */ -#define PVOID void * +#define DMPVOID void * /* Borland redefined the environment variable, sigh */ #define environ _environ diff --git a/dmake/msdos/borland/bcc45/config.h b/dmake/msdos/borland/bcc45/config.h index 994a10eab1ba..b59a431fa317 100644 --- a/dmake/msdos/borland/bcc45/config.h +++ b/dmake/msdos/borland/bcc45/config.h @@ -1,4 +1,4 @@ -/* RCS $Id: config.h,v 1.1.1.1 2000-09-22 15:33:28 hr Exp $ +/* RCS $Id: config.h,v 1.2 2008-03-05 18:36:44 kz Exp $ -- -- SYNOPSIS -- Configurarion include file. @@ -42,7 +42,7 @@ extern unsigned int coreleft(); #endif /* a small problem with pointer to voids on some unix machines needs this */ -#define PVOID void * +#define DMPVOID void * /* Borland redefined the environment variable, sigh */ #define environ _environ |