diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:41:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:41:34 +0000 |
| commit | a4ed05876c25ae8364469937033751f9ff7294d8 (patch) | |
| tree | 6c86f6fa4dae87ac92cd8abcbc841260ba9b4675 /dmake | |
| parent | 342f180ba1689c14d995f0d1eaa635ff2ac42e0f (diff) | |
INTEGRATION: CWS dmake412_DEV300 (1.1.1.1.176); FILE MERGED
2007/11/11 00:03:34 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/win95/borland/bcc50/config.h | 4 | ||||
| -rw-r--r-- | dmake/winnt/borland/bcc50/config.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dmake/win95/borland/bcc50/config.h b/dmake/win95/borland/bcc50/config.h index c39a4816f54f..709aad379ea1 100644 --- a/dmake/win95/borland/bcc50/config.h +++ b/dmake/win95/borland/bcc50/config.h @@ -1,4 +1,4 @@ -/* RCS $Id: config.h,v 1.1.1.1 2000-09-22 15:33:36 hr Exp $ +/* RCS $Id: config.h,v 1.2 2008-03-05 18:39:58 kz Exp $ -- -- SYNOPSIS -- Configurarion include file. @@ -38,7 +38,7 @@ extern unsigned int coreleft(); #define CONST const /* 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/winnt/borland/bcc50/config.h b/dmake/winnt/borland/bcc50/config.h index dc9f72b439bd..77c577995664 100644 --- a/dmake/winnt/borland/bcc50/config.h +++ b/dmake/winnt/borland/bcc50/config.h @@ -1,4 +1,4 @@ -/* RCS $Id: config.h,v 1.1.1.1 2000-09-22 15:33:37 hr Exp $ +/* RCS $Id: config.h,v 1.2 2008-03-05 18:41:34 kz Exp $ -- -- SYNOPSIS -- Configurarion include file. @@ -38,7 +38,7 @@ extern unsigned int coreleft(); #define CONST const /* 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 |