From a9252ebd150006e8c46c0eeea4c9226c57bb3b2e Mon Sep 17 00:00:00 2001 From: davygrvy Date: Wed, 5 Sep 2001 03:34:22 +0000 Subject: * generic/tcl.h: * generic/tclPlatDecls.h: Borland compatibility change so ClientData was properly typed as a void* and TCHAR would not be defined twice. --- generic/tclPlatDecls.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index 209de2d..0201034 100644 --- a/generic/tclPlatDecls.h +++ b/generic/tclPlatDecls.h @@ -6,7 +6,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclPlatDecls.h,v 1.8 2001/08/02 20:15:40 mdejong Exp $ + * RCS: @(#) $Id: tclPlatDecls.h,v 1.9 2001/09/05 03:34:22 davygrvy Exp $ */ #ifndef _TCLPLATDECLS @@ -17,8 +17,12 @@ * of the core are matching against your project build for these * public functions. BE AWARE. */ -#if defined(__WIN32__) && !defined(_INC_TCHAR) -#include +#if defined(__WIN32__) && (!defined(_TCHAR_DEFINED) && !defined(__TCHAR_DEFINED)) +# include +# ifndef _TCHAR_DEFINED + /* tchar.h doesn't set this. winnt.h checks this. */ +# define _TCHAR_DEFINED +# endif #endif /* !BEGIN!: Do not edit below this line. */ -- cgit v0.12