summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordavygrvy <davygrvy@pobox.com>2001-09-09 22:45:13 (GMT)
committerdavygrvy <davygrvy@pobox.com>2001-09-09 22:45:13 (GMT)
commit9fb13605356e28292ca0b26246503193edeb6400 (patch)
tree7150e9d1a4c4565b6218858a6b1d6ffd57a06b85 /generic
parent24a8ccc2c6392872e42814dd4d1508be50ce76de (diff)
downloadtcl-9fb13605356e28292ca0b26246503193edeb6400.zip
tcl-9fb13605356e28292ca0b26246503193edeb6400.tar.gz
tcl-9fb13605356e28292ca0b26246503193edeb6400.tar.bz2
* generic/tcl.h:
* generic/tclPlatDecls.h: Reminder from David Cuthbert <dacut@kanga.org> that I hadn't finished the Borland compatibility stuff. [Patch: 436116]
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.h4
-rw-r--r--generic/tclPlatDecls.h4
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 <tchar.h>
# ifndef _TCHAR_DEFINED
/* Borland seems to forget to set this. */
- typedef wchar_t TCHAR;
+ typedef _TCHAR TCHAR;
# define _TCHAR_DEFINED
# endif
#endif