From 9fb13605356e28292ca0b26246503193edeb6400 Mon Sep 17 00:00:00 2001 From: davygrvy Date: Sun, 9 Sep 2001 22:45:13 +0000 Subject: * generic/tcl.h: * generic/tclPlatDecls.h: Reminder from David Cuthbert that I hadn't finished the Borland compatibility stuff. [Patch: 436116] --- generic/tcl.h | 4 ++-- generic/tclPlatDecls.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generic/tcl.h b/generic/tcl.h index 49d177a..6ce21fd 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tcl.h,v 1.100 2001/09/05 04:32:11 davygrvy Exp $ + * RCS: @(#) $Id: tcl.h,v 1.101 2001/09/09 22:45:13 davygrvy Exp $ */ #ifndef _TCL @@ -227,7 +227,7 @@ extern "C" { # define DLLIMPORT # define DLLEXPORT #else -# if defined(__WIN32__) && (defined(_MSC_VER) || (defined(__GNUC__) && defined(__declspec))) +# if defined(__WIN32__) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) || (defined(__GNUC__) && defined(__declspec))) # define DLLIMPORT __declspec(dllimport) # define DLLEXPORT __declspec(dllexport) # else diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index be0ac41..10430bc 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.11 2001/09/06 00:41:58 davygrvy Exp $ + * RCS: @(#) $Id: tclPlatDecls.h,v 1.12 2001/09/09 22:45:13 davygrvy Exp $ */ #ifndef _TCLPLATDECLS @@ -21,7 +21,7 @@ # include # ifndef _TCHAR_DEFINED /* Borland seems to forget to set this. */ - typedef wchar_t TCHAR; + typedef _TCHAR TCHAR; # define _TCHAR_DEFINED # endif #endif -- cgit v0.12