From a4ed05876c25ae8364469937033751f9ff7294d8 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 5 Mar 2008 17:41:34 +0000 Subject: 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. --- dmake/winnt/borland/bcc50/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dmake/winnt') 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 -- cgit