diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-08-21 21:35:35 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-08-21 21:35:35 (GMT) |
| commit | 2b9c55d714bec1b7497dba6f79d2c54f13e9c07a (patch) | |
| tree | 80b97b4a4fd93d9a22e4c6ec070ea9dbdc41993c /generic/tcl.h | |
| parent | 3665ead9e176eb4b5058f87e048c67ea3efb3dd3 (diff) | |
| download | tcl-2b9c55d714bec1b7497dba6f79d2c54f13e9c07a.zip tcl-2b9c55d714bec1b7497dba6f79d2c54f13e9c07a.tar.gz tcl-2b9c55d714bec1b7497dba6f79d2c54f13e9c07a.tar.bz2 | |
* generic/tcl.h: Reduced the use of CONST86 and eliminated
* generic/tcl.decls: the use of CONST86_RETURN to support source
code compatibility with Tcl 8.5 on those public routines passing
(Tcl_Filesystem *), (Tcl_Timer *), and (Tcl_Objtype *) values which
have been const-ified. What remains is the minimum configurability
needed to support code written for pre-8.6 headers via the new
-DUSE_COMPAT85_CONST compiler directive.
*** POTENTIAL INCOMPATIBILITY ***
* generic/tclDecls.h: make genstubs
Diffstat (limited to 'generic/tcl.h')
| -rw-r--r-- | generic/tcl.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 1feda6f..ba0d938 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -13,7 +13,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.264 2008/08/12 15:10:33 dgp Exp $ + * RCS: @(#) $Id: tcl.h,v 1.265 2008/08/21 21:35:37 dgp Exp $ */ #ifndef _TCL @@ -261,8 +261,11 @@ extern "C" { # endif #endif -#define CONST86 CONST84 -#define CONST86_RETURN CONST84_RETURN +#ifdef USE_COMPAT85_CONST +# define CONST86 +#else +# define CONST86 CONST +#endif /* * Make sure EXTERN isn't defined elsewhere @@ -722,7 +725,7 @@ typedef void (Tcl_MainLoopProc) _ANSI_ARGS_((void)); */ typedef struct Tcl_ObjType { - CONST86 char *name; /* Name of the type, e.g. "int". */ + CONST char *name; /* Name of the type, e.g. "int". */ Tcl_FreeInternalRepProc *freeIntRepProc; /* Called to free any storage for the type's * internal rep. NULL if the internal rep does @@ -760,7 +763,7 @@ typedef struct Tcl_Obj { * array as a readonly value. */ int length; /* The number of bytes at *bytes, not * including the terminating null. */ - CONST86 Tcl_ObjType *typePtr; /* Denotes the object's type. Always + CONST Tcl_ObjType *typePtr; /* Denotes the object's type. Always * corresponds to the type of the object's * internal rep. NULL indicates the object has * no internal rep (has no type). */ |