From 0ab5a9eadd4a1d303e6f1c410921c09b744c1a29 Mon Sep 17 00:00:00 2001 From: davygrvy Date: Wed, 5 Sep 2001 04:32:11 +0000 Subject: * generic/tcl.h: Removed a small mistake from before. Changes to the EXTERN macro for proper Borland compatibility will have to see a TIP. What's this with the MS compiler: __declspec(dllexport) int func (int a, int b); will have to be this with Borland: int __cdecl __export func (int a, int b); The order of the attribute needs to be after the return type. --- generic/tcl.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/generic/tcl.h b/generic/tcl.h index d210a6d..49d177a 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.99 2001/09/05 03:12:03 davygrvy Exp $ + * RCS: @(#) $Id: tcl.h,v 1.100 2001/09/05 04:32:11 davygrvy Exp $ */ #ifndef _TCL @@ -72,7 +72,7 @@ extern "C" { #ifndef __WIN32__ # if defined(_WIN32) || defined(WIN32) || \ - defined(__CYGWIN__) || defined(__MINGW32__) + defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__) # define __WIN32__ # endif #endif @@ -224,16 +224,16 @@ extern "C" { */ #ifdef STATIC_BUILD -# define DLLIMPORT -# define DLLEXPORT +# define DLLIMPORT +# define DLLEXPORT #else -# if defined(__WIN32__) && (defined(_MSC_VER) || (defined(__GNUC__) && defined(__declspec))) -# define DLLIMPORT __declspec(dllimport) -# define DLLEXPORT __declspec(dllexport) -# else -# define DLLIMPORT -# define DLLEXPORT -# endif +# if defined(__WIN32__) && (defined(_MSC_VER) || (defined(__GNUC__) && defined(__declspec))) +# define DLLIMPORT __declspec(dllimport) +# define DLLEXPORT __declspec(dllexport) +# else +# define DLLIMPORT +# define DLLEXPORT +# endif #endif /* -- cgit v0.12