diff options
| author | nijtmans <nijtmans> | 2008-07-27 22:18:21 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2008-07-27 22:18:21 (GMT) |
| commit | 18bbede136bbdbc5867f284093730f6b5b57cff6 (patch) | |
| tree | 9addfbbe83939c7f293726911007b5a5c83bb4be /generic/tcl.h | |
| parent | 496f531a89bb73a3d70a47ab4ef3d124081806ec (diff) | |
| download | tcl-18bbede136bbdbc5867f284093730f6b5b57cff6.zip tcl-18bbede136bbdbc5867f284093730f6b5b57cff6.tar.gz tcl-18bbede136bbdbc5867f284093730f6b5b57cff6.tar.bz2 | |
* doc/Object.3 CONSTified 3 functions using
* doc/ObjectType.3 Tcl_ObjType which all are supposed
* generic/tcl.decls to be a constant, but this was not
* generic/tcl.h reflected in the API:
* generic/tclDecls.h Tcl_ConvertToType
* generic/tclObj.c Tcl_GetObjType
* generic/tclCompCmds.c Tcl_RegisterObjType
* generic/tclOOMethod.c Introduced a CONST86_RETURN, so extensions which
* generic/tclTestobj.c use Tcl_ObjType directly can be modified to compile
against both Tcl 8.5 and Tcl 8.6
tclDecls.h is re-generated with "make genstubs"
This change complies with TIP #24
***POTENTIAL INCOMPATIBILITY***
Diffstat (limited to 'generic/tcl.h')
| -rw-r--r-- | generic/tcl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 6b539ea..c98cef2 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.262 2008/07/24 21:54:38 nijtmans Exp $ + * RCS: @(#) $Id: tcl.h,v 1.263 2008/07/27 22:18:23 nijtmans Exp $ */ #ifndef _TCL @@ -262,6 +262,7 @@ extern "C" { #endif #define CONST86 CONST84 +#define CONST86_RETURN CONST84_RETURN /* * Make sure EXTERN isn't defined elsewhere @@ -721,7 +722,7 @@ typedef void (Tcl_MainLoopProc) _ANSI_ARGS_((void)); */ typedef struct Tcl_ObjType { - char *name; /* Name of the type, e.g. "int". */ + CONST86 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 @@ -759,7 +760,7 @@ typedef struct Tcl_Obj { * array as a readonly value. */ int length; /* The number of bytes at *bytes, not * including the terminating null. */ - Tcl_ObjType *typePtr; /* Denotes the object's type. Always + CONST86 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). */ |