| tcl.h | tcl.h | |||
|---|---|---|---|---|
| skipping to change at line 16 | skipping to change at line 16 | |||
| * | * | |||
| * Copyright (c) 1987-1994 The Regents of the University of California. | * Copyright (c) 1987-1994 The Regents of the University of California. | |||
| * Copyright (c) 1993-1996 Lucent Technologies. | * Copyright (c) 1993-1996 Lucent Technologies. | |||
| * Copyright (c) 1994-1998 Sun Microsystems, Inc. | * Copyright (c) 1994-1998 Sun Microsystems, Inc. | |||
| * Copyright (c) 1998-2000 by Scriptics Corporation. | * Copyright (c) 1998-2000 by Scriptics Corporation. | |||
| * Copyright (c) 2002 by Kevin B. Kenny. All rights reserved. | * Copyright (c) 2002 by Kevin B. Kenny. All rights reserved. | |||
| * | * | |||
| * See the file "license.terms" for information on usage and redistribution of | * See the file "license.terms" for information on usage and redistribution of | |||
| * this file, and for a DISCLAIMER OF ALL WARRANTIES. | * this file, and for a DISCLAIMER OF ALL WARRANTIES. | |||
| * | * | |||
| * RCS: @(#) $Id: tcl.h,v 1.254.2.2 2008/06/30 03:18:57 dgp Exp $ | * RCS: @(#) $Id: tcl.h,v 1.254.2.4 2008/08/08 15:22:27 dgp Exp $ | |||
| */ | */ | |||
| #ifndef _TCL | #ifndef _TCL | |||
| #define _TCL | #define _TCL | |||
| /* | /* | |||
| * For C++ compilers, use extern "C" | * For C++ compilers, use extern "C" | |||
| */ | */ | |||
| #ifdef __cplusplus | #ifdef __cplusplus | |||
| skipping to change at line 63 | skipping to change at line 63 | |||
| * win/README (not patchlevel) (sections 0 and 2) | * win/README (not patchlevel) (sections 0 and 2) | |||
| * unix/tcl.spec (1 LOC patch) | * unix/tcl.spec (1 LOC patch) | |||
| * tools/tcl.hpj.in (not patchlevel, for windows installer) | * tools/tcl.hpj.in (not patchlevel, for windows installer) | |||
| * tools/tcl.wse.in (for windows installer) | * tools/tcl.wse.in (for windows installer) | |||
| * tools/tclSplash.bmp (not patchlevel) | * tools/tclSplash.bmp (not patchlevel) | |||
| */ | */ | |||
| #define TCL_MAJOR_VERSION 8 | #define TCL_MAJOR_VERSION 8 | |||
| #define TCL_MINOR_VERSION 5 | #define TCL_MINOR_VERSION 5 | |||
| #define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE | #define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE | |||
| #define TCL_RELEASE_SERIAL 3 | #define TCL_RELEASE_SERIAL 4 | |||
| #define TCL_VERSION "8.5" | #define TCL_VERSION "8.5" | |||
| #define TCL_PATCH_LEVEL "8.5.3" | #define TCL_PATCH_LEVEL "8.5.4" | |||
| /* | /* | |||
| * The following definitions set up the proper options for Windows compiler s. | * The following definitions set up the proper options for Windows compiler s. | |||
| * We use this method because there is no autoconf equivalent. | * We use this method because there is no autoconf equivalent. | |||
| */ | */ | |||
| #ifndef __WIN32__ | #ifndef __WIN32__ | |||
| # if defined(_WIN32) || defined(WIN32) || defined(__MINGW32__) || defined (__BORLANDC__) || (defined(__WATCOMC__) && defined(__WINDOWS_386__)) | # if defined(_WIN32) || defined(WIN32) || defined(__MINGW32__) || defined (__BORLANDC__) || (defined(__WATCOMC__) && defined(__WINDOWS_386__)) | |||
| # define __WIN32__ | # define __WIN32__ | |||
| # ifndef WIN32 | # ifndef WIN32 | |||
| skipping to change at line 175 | skipping to change at line 175 | |||
| * defined. | * defined. | |||
| * | * | |||
| * Note: when building static but linking dynamically to MSVCRT we must sti ll | * Note: when building static but linking dynamically to MSVCRT we must sti ll | |||
| * correctly decorate the C library imported function. Use CRTIMPORT | * correctly decorate the C library imported function. Use CRTIMPORT | |||
| * for this purpose. _DLL is defined by the compiler when linking to | * for this purpose. _DLL is defined by the compiler when linking to | |||
| * MSVCRT. | * MSVCRT. | |||
| */ | */ | |||
| #if (defined(__WIN32__) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) | | defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined (__declspec)))) | #if (defined(__WIN32__) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) | | defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined (__declspec)))) | |||
| # define HAVE_DECLSPEC 1 | # define HAVE_DECLSPEC 1 | |||
| #endif | # ifdef STATIC_BUILD | |||
| # define DLLIMPORT | ||||
| #ifdef STATIC_BUILD | # define DLLEXPORT | |||
| # define DLLIMPORT | # ifdef _DLL | |||
| # define DLLEXPORT | # define CRTIMPORT __declspec(dllimport) | |||
| # if HAVE_DECLSPEC && defined(_DLL) | # else | |||
| # define CRTIMPORT __declspec(dllimport) | # define CRTIMPORT | |||
| # endif | ||||
| # else | # else | |||
| # define CRTIMPORT | # define DLLIMPORT __declspec(dllimport) | |||
| # define DLLEXPORT __declspec(dllexport) | ||||
| # define CRTIMPORT __declspec(dllimport) | ||||
| # endif | # endif | |||
| #else | #else | |||
| # if HAVE_DECLSPEC | # define DLLIMPORT | |||
| # define DLLIMPORT __declspec(dllimport) | # if defined(__GNUC__) && __GNUC__ > 3 | |||
| # define DLLEXPORT __declspec(dllexport) | # define DLLEXPORT __attribute__ ((visibility("default"))) | |||
| # define CRTIMPORT __declspec(dllimport) | ||||
| # else | # else | |||
| # define DLLIMPORT | # define DLLEXPORT | |||
| # define DLLEXPORT | ||||
| # define CRTIMPORT | ||||
| # endif | # endif | |||
| # define CRTIMPORT | ||||
| #endif | #endif | |||
| /* | /* | |||
| * These macros are used to control whether functions are being declared fo r | * These macros are used to control whether functions are being declared fo r | |||
| * import or export. If a function is being declared while it is being buil t | * import or export. If a function is being declared while it is being buil t | |||
| * to be included in a shared library, then it should have the DLLEXPORT | * to be included in a shared library, then it should have the DLLEXPORT | |||
| * storage class. If is being declared for use by a module that is going to | * storage class. If is being declared for use by a module that is going to | |||
| * link against the shared library, then it should have the DLLIMPORT stora ge | * link against the shared library, then it should have the DLLIMPORT stora ge | |||
| * class. If the symbol is beind declared for a static build or for use fro m a | * class. If the symbol is beind declared for a static build or for use fro m a | |||
| * stub library, then the storage class should be empty. | * stub library, then the storage class should be empty. | |||
| End of changes. 8 change blocks. | ||||
| 18 lines changed or deleted | 19 lines changed or added | |||