diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:38:08 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:38:08 +0000 |
| commit | c7cd04f5b4c78c321ba9315e1ae8d3a84fe9e7b5 (patch) | |
| tree | 2938543f04f9a3e06030247202966a1a7dcca070 /dmake | |
| parent | 7d8addda8a30d99df8da36acba3f035ac25b180d (diff) | |
INTEGRATION: CWS dmake412_DEV300 (1.1.1.1.176); FILE MERGED
2007/11/11 00:03:33 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/bcc50/config.h | 4 | ||||
| -rw-r--r-- | dmake/msdos/borland/tcc20/config.h | 4 | ||||
| -rw-r--r-- | dmake/msdos/microsft/config.h | 4 | ||||
| -rw-r--r-- | dmake/msdos/zortech/config.h | 4 | ||||
| -rw-r--r-- | dmake/os2/ibm/config.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/dmake/msdos/borland/bcc50/config.h b/dmake/msdos/borland/bcc50/config.h index 994a10eab1ba..cd1a8cca5016 100644 --- a/dmake/msdos/borland/bcc50/config.h +++ b/dmake/msdos/borland/bcc50/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:58 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/tcc20/config.h b/dmake/msdos/borland/tcc20/config.h index fdf421e87910..27fae79049cf 100644 --- a/dmake/msdos/borland/tcc20/config.h +++ b/dmake/msdos/borland/tcc20/config.h @@ -1,4 +1,4 @@ -/* RCS $Id: config.h,v 1.1.1.1 2000-09-22 15:33:29 hr Exp $ +/* RCS $Id: config.h,v 1.2 2008-03-05 18:37:12 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/microsft/config.h b/dmake/msdos/microsft/config.h index ba62cfe2a353..da2d7cbfc31f 100644 --- a/dmake/msdos/microsft/config.h +++ b/dmake/msdos/microsft/config.h @@ -1,4 +1,4 @@ -/* RCS $Id: config.h,v 1.1.1.1 2000-09-22 15:33:29 hr Exp $ +/* RCS $Id: config.h,v 1.2 2008-03-05 18:37:29 kz Exp $ -- -- SYNOPSIS -- Configurarion include file. @@ -71,7 +71,7 @@ #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/zortech/config.h b/dmake/msdos/zortech/config.h index 096498844fc9..dabc8b014fe6 100644 --- a/dmake/msdos/zortech/config.h +++ b/dmake/msdos/zortech/config.h @@ -1,4 +1,4 @@ -/* RCS $Id: config.h,v 1.1.1.1 2000-09-22 15:33:29 hr Exp $ +/* RCS $Id: config.h,v 1.2 2008-03-05 18:37:45 kz Exp $ -- -- SYNOPSIS -- Configurarion include file. @@ -47,6 +47,6 @@ extern unsigned _psp; /* a small problem with pointer to voids on some unix machines needs this */ -#define PVOID void * +#define DMPVOID void * #include <io.h> diff --git a/dmake/os2/ibm/config.h b/dmake/os2/ibm/config.h index afff0f203845..cd8199445066 100644 --- a/dmake/os2/ibm/config.h +++ b/dmake/os2/ibm/config.h @@ -1,4 +1,4 @@ -/* RCS $Id: config.h,v 1.1.1.1 2000-09-22 15:33:30 hr Exp $ +/* RCS $Id: config.h,v 1.2 2008-03-05 18:38:08 kz Exp $ -- -- SYNOPSIS -- Configurarion include file. @@ -66,7 +66,7 @@ #endif /* a small problem with pointer to voids on some unix machines needs this */ -#define PVOID void * +#define DMPVOID void * /* C-lib redefinitions... */ #define dup _dup |