From d56407609ac6541f6547c256db0a5c1534af5633 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 5 Mar 2008 17:40:17 +0000 Subject: INTEGRATION: CWS dmake412_DEV300 (1.13.2); FILE MERGED 2008/02/26 23:37:50 vq 1.13.2.3: #i83497# Release dmake 4.12. 2007/11/11 00:03:34 vq 1.13.2.2: #i83523# Rename macro PVOID to DMPVOID to avoid problems when including windows.h. 2007/11/09 15:50:51 vq 1.13.2.1: #i83497# Bump version to 4.12-cvs. --- dmake/win95/microsft/config.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dmake') diff --git a/dmake/win95/microsft/config.h b/dmake/win95/microsft/config.h index 831b0d797806..e04d1bd72669 100644 --- a/dmake/win95/microsft/config.h +++ b/dmake/win95/microsft/config.h @@ -1,6 +1,6 @@ /* $RCSfile: config.h,v $ --- $Revision: 1.13 $ --- last change: $Author: ihi $ $Date: 2007-10-15 15:58:14 $ +-- $Revision: 1.14 $ +-- last change: $Author: kz $ $Date: 2008-03-05 18:40:17 $ -- -- SYNOPSIS -- Configurarion include file. @@ -38,7 +38,7 @@ /* Name and version number of this package */ #define PACKAGE "dmake" -#define VERSION "4.11" +#define VERSION "4.12" #define BUILDINFO "Windows / MS Visual C++" #if defined (_MSC_VER) @@ -113,7 +113,7 @@ #endif /* a small problem with pointer to voids on some unix machines needs this */ -#define PVOID void * +#define DMPVOID void * /* Use my own tempnam for MSC Version less than 6.0 */ #if _MSC_VER < 600 -- cgit