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 | d9d2e47367313e64bed99c48995cf794a76fd52a (patch) | |
| tree | 6d0365a95b78ab39787f18316ea9693ec9afba3c | |
| parent | a4a6f8750a695fad2c2fffc5f5fd66046a69f84e (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.
| -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 e336d91fa..4f320e25f 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 576d15f76..058c51446 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 576d15f76..b90aa5196 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 |