| 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 | * 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.147 2002/10/21 04:35:50 das Exp $ | * RCS: @(#) $Id: tcl.h,v 1.153 2003/02/15 02:16:29 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 | |||
| * win/README (not patchlevel) (sections 0 and 2) | * win/README (not patchlevel) (sections 0 and 2) | |||
| * unix/tcl.spec (2 LOC Major/Minor, 1 LOC patch) | * unix/tcl.spec (2 LOC Major/Minor, 1 LOC patch) | |||
| * tests/basic.test (1 LOC M/M, not patchlevel) | * tests/basic.test (1 LOC M/M, not patchlevel) | |||
| * 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 4 | #define TCL_MINOR_VERSION 4 | |||
| #define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE | #define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE | |||
| #define TCL_RELEASE_SERIAL 1 | #define TCL_RELEASE_SERIAL 2 | |||
| #define TCL_PREFIX_IDENT "" | ||||
| #define TCL_DEBUG_IDENT TCL_DBGX | ||||
| #define TCL_VERSION "8.4" | #define TCL_VERSION "8.4" | |||
| #define TCL_PATCH_LEVEL "8.4.1" | #define TCL_PATCH_LEVEL "8.4.2" | |||
| /* | /* | |||
| * 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) || defined(__MINGW32__) || defined (__BORLANDC__) | # if defined(_WIN32) || defined(WIN32) || defined(__MINGW32__) || defined (__BORLANDC__) | |||
| # define __WIN32__ | # define __WIN32__ | |||
| # ifndef WIN32 | # ifndef WIN32 | |||
| skipping to change at line 284 | skipping to change at line 287 | |||
| #ifdef __cplusplus | #ifdef __cplusplus | |||
| # define EXTERN extern "C" TCL_STORAGE_CLASS | # define EXTERN extern "C" TCL_STORAGE_CLASS | |||
| #else | #else | |||
| # define EXTERN extern TCL_STORAGE_CLASS | # define EXTERN extern TCL_STORAGE_CLASS | |||
| #endif | #endif | |||
| /* | /* | |||
| * The following code is copied from winnt.h. | * The following code is copied from winnt.h. | |||
| * If we don't replicate it here, then <windows.h> can't be included | * If we don't replicate it here, then <windows.h> can't be included | |||
| * after tcl.h, since tcl.h also defines VOID. | * after tcl.h, since tcl.h also defines VOID. | |||
| * This block is skipped under Cygwin and Mingw. | ||||
| * | ||||
| * | ||||
| */ | */ | |||
| #ifdef __WIN32__ | #if defined(__WIN32__) && !defined(HAVE_WINNT_IGNORE_VOID) | |||
| #ifndef VOID | #ifndef VOID | |||
| #define VOID void | #define VOID void | |||
| typedef char CHAR; | typedef char CHAR; | |||
| typedef short SHORT; | typedef short SHORT; | |||
| typedef long LONG; | typedef long LONG; | |||
| #endif | #endif | |||
| #endif /* __WIN32__ */ | #endif /* __WIN32__ && !HAVE_WINNT_IGNORE_VOID */ | |||
| /* | /* | |||
| * Macro to use instead of "void" for arguments that must have | * Macro to use instead of "void" for arguments that must have | |||
| * type "void *" in ANSI C; maps them to type "char *" in | * type "void *" in ANSI C; maps them to type "char *" in | |||
| * non-ANSI systems. | * non-ANSI systems. | |||
| */ | */ | |||
| #ifndef NO_VOID | #ifndef NO_VOID | |||
| # define VOID void | # define VOID void | |||
| #else | #else | |||
| skipping to change at line 347 | skipping to change at line 353 | |||
| * | * | |||
| * Note on converting between Tcl_WideInt and strings. This | * Note on converting between Tcl_WideInt and strings. This | |||
| * implementation (in tclObj.c) depends on the functions strtoull() | * implementation (in tclObj.c) depends on the functions strtoull() | |||
| * and sprintf(...,"%" TCL_LL_MODIFIER "d",...). TCL_LL_MODIFIER_SIZE | * and sprintf(...,"%" TCL_LL_MODIFIER "d",...). TCL_LL_MODIFIER_SIZE | |||
| * is the length of the modifier string, which is "ll" on most 32-bit | * is the length of the modifier string, which is "ll" on most 32-bit | |||
| * Unix systems. It has to be split up like this to allow for the more | * Unix systems. It has to be split up like this to allow for the more | |||
| * complex formats sometimes needed (e.g. in the format(n) command.) | * complex formats sometimes needed (e.g. in the format(n) command.) | |||
| */ | */ | |||
| #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG) | #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG) | |||
| # ifdef __CYGWIN__ | # if defined(__CYGWIN__) | |||
| # define TCL_WIDE_INT_TYPE long long | # define TCL_WIDE_INT_TYPE long long | |||
| # define TCL_LL_MODIFIER "L" | # define TCL_LL_MODIFIER "L" | |||
| typedef struct stat Tcl_StatBuf; | typedef struct stat Tcl_StatBuf; | |||
| # define TCL_LL_MODIFIER_SIZE 1 | # define TCL_LL_MODIFIER_SIZE 1 | |||
| # elif defined(__WIN32__) | # elif defined(__WIN32__) | |||
| # define TCL_WIDE_INT_TYPE __int64 | # define TCL_WIDE_INT_TYPE __int64 | |||
| # ifdef __BORLANDC__ | # ifdef __BORLANDC__ | |||
| typedef struct stati64 Tcl_StatBuf; | typedef struct stati64 Tcl_StatBuf; | |||
| # define TCL_LL_MODIFIER "L" | # define TCL_LL_MODIFIER "L" | |||
| # define TCL_LL_MODIFIER_SIZE 1 | # define TCL_LL_MODIFIER_SIZE 1 | |||
| End of changes. 7 change blocks. | ||||
| 6 lines changed or deleted | 12 lines changed or added | |||