| tcl.h | tcl.h | |||
|---|---|---|---|---|
| skipping to change at line 15 | skipping to change at line 15 | |||
| * of the Tcl interpreter. | * of the Tcl interpreter. | |||
| * | * | |||
| * 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. | |||
| * | * | |||
| * See the file "license.terms" for information on usage and redistribution | * See the file "license.terms" for information on usage and redistribution | |||
| * of this file, and for a DISCLAIMER OF ALL WARRANTIES. | * of this file, and for a DISCLAIMER OF ALL WARRANTIES. | |||
| * | * | |||
| * RCS: @(#) $Id: tcl.h,v 1.70.2.1 2000/07/27 01:39:14 hobbs Exp $ | * RCS: @(#) $Id: tcl.h,v 1.70.2.3 2001/04/04 21:22:17 hobbs 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 62 | skipping to change at line 62 | |||
| * unix/tcl.spec (2 LOC Major/Minor, 1 LOC patch) | * unix/tcl.spec (2 LOC Major/Minor, 1 LOC patch) | |||
| * tests/basic.test (not patchlevel) (version checks) | * tests/basic.test (not patchlevel) (version checks) | |||
| * 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 3 | #define TCL_MINOR_VERSION 3 | |||
| #define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE | #define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE | |||
| #define TCL_RELEASE_SERIAL 2 | #define TCL_RELEASE_SERIAL 3 | |||
| #define TCL_VERSION "8.3" | #define TCL_VERSION "8.3" | |||
| #define TCL_PATCH_LEVEL "8.3.2" | #define TCL_PATCH_LEVEL "8.3.3" | |||
| /* | /* | |||
| * The following definitions set up the proper options for Windows | * The following definitions set up the proper options for Windows | |||
| * compilers. We use this method because there is no autoconf equivalent. | * compilers. We use this method because there is no autoconf equivalent. | |||
| */ | */ | |||
| #ifndef __WIN32__ | #ifndef __WIN32__ | |||
| # if defined(_WIN32) || defined(WIN32) | # if defined(_WIN32) || defined(WIN32) | |||
| # define __WIN32__ | # define __WIN32__ | |||
| # endif | # endif | |||
| skipping to change at line 108 | skipping to change at line 108 | |||
| # define USE_TCLALLOC 1 | # define USE_TCLALLOC 1 | |||
| # endif | # endif | |||
| #endif /* __WIN32__ */ | #endif /* __WIN32__ */ | |||
| /* | /* | |||
| * The following definitions set up the proper options for Macintosh | * The following definitions set up the proper options for Macintosh | |||
| * compilers. We use this method because there is no autoconf equivalent. | * compilers. We use this method because there is no autoconf equivalent. | |||
| */ | */ | |||
| #ifdef MAC_TCL | #ifdef MAC_TCL | |||
| #include <ConditionalMacros.h> | ||||
| # ifndef HAS_STDARG | # ifndef HAS_STDARG | |||
| # define HAS_STDARG 1 | # define HAS_STDARG 1 | |||
| # endif | # endif | |||
| # ifndef USE_TCLALLOC | # ifndef USE_TCLALLOC | |||
| # define USE_TCLALLOC 1 | # define USE_TCLALLOC 1 | |||
| # endif | # endif | |||
| # ifndef NO_STRERROR | # ifndef NO_STRERROR | |||
| # define NO_STRERROR 1 | # define NO_STRERROR 1 | |||
| # endif | # endif | |||
| # define INLINE | # define INLINE | |||
| skipping to change at line 228 | skipping to change at line 229 | |||
| * Used by Windows, maps to no-op declarations on non-Windows systems. | * Used by Windows, maps to no-op declarations on non-Windows systems. | |||
| * The default build on windows is for a DLL, which causes the DLLIMPORT | * The default build on windows is for a DLL, which causes the DLLIMPORT | |||
| * and DLLEXPORT macros to be nonempty. To build a static library, the | * and DLLEXPORT macros to be nonempty. To build a static library, the | |||
| * macro STATIC_BUILD should be defined. | * macro STATIC_BUILD should be defined. | |||
| */ | */ | |||
| #ifdef STATIC_BUILD | #ifdef STATIC_BUILD | |||
| # define DLLIMPORT | # define DLLIMPORT | |||
| # define DLLEXPORT | # define DLLEXPORT | |||
| #else | #else | |||
| # if defined(__WIN32__) && (defined(_MSC_VER) || (defined(__GNUC__) && defi ned(__declspec))) | # if (defined(__WIN32__) && (defined(_MSC_VER) || (defined(__GNUC__) && def ined(__declspec)))) || (defined(MAC_TCL) && FUNCTION_DECLSPEC) | |||
| # define DLLIMPORT __declspec(dllimport) | # define DLLIMPORT __declspec(dllimport) | |||
| # define DLLEXPORT __declspec(dllexport) | # define DLLEXPORT __declspec(dllexport) | |||
| # else | # else | |||
| # define DLLIMPORT | # define DLLIMPORT | |||
| # define DLLEXPORT | # define DLLEXPORT | |||
| # endif | # endif | |||
| #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 | |||
| skipping to change at line 250 | skipping to change at line 251 | |||
| * 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 t o | * storage class. If is being declared for use by a module that is going t o | |||
| * 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 fr om a | * class. If the symbol is beind declared for a static build or for use fr om a | |||
| * stub library, then the storage class should be empty. | * stub library, then the storage class should be empty. | |||
| * | * | |||
| * The convention is that a macro called BUILD_xxxx, where xxxx is the | * The convention is that a macro called BUILD_xxxx, where xxxx is the | |||
| * name of a library we are building, is set on the compile line for source s | * name of a library we are building, is set on the compile line for source s | |||
| * that are to be placed in the library. When this macro is set, the | * that are to be placed in the library. When this macro is set, the | |||
| * storage class will be set to DLLEXPORT. At the end of the header file, the | * storage class will be set to DLLEXPORT. At the end of the header file, the | |||
| * storage class will be reset to DLLIMPORt. | * storage class will be reset to DLLIMPORT. | |||
| */ | */ | |||
| #undef TCL_STORAGE_CLASS | #undef TCL_STORAGE_CLASS | |||
| #ifdef BUILD_tcl | #ifdef BUILD_tcl | |||
| # define TCL_STORAGE_CLASS DLLEXPORT | # define TCL_STORAGE_CLASS DLLEXPORT | |||
| #else | #else | |||
| # ifdef USE_TCL_STUBS | # ifdef USE_TCL_STUBS | |||
| # define TCL_STORAGE_CLASS | # define TCL_STORAGE_CLASS | |||
| # else | # else | |||
| # define TCL_STORAGE_CLASS DLLIMPORT | # define TCL_STORAGE_CLASS DLLIMPORT | |||
| End of changes. 6 change blocks. | ||||
| 5 lines changed or deleted | 6 lines changed or added | |||