| itcl.h | | itcl.h | |
| | | | |
| skipping to change at line 60 | | skipping to change at line 60 | |
| * above is included in this distribution. | | * above is included in this distribution. | |
| * | | * | |
| *--------------------------------------------------------------------- | | *--------------------------------------------------------------------- | |
| */ | | */ | |
| | | | |
| #ifndef ITCL_H_INCLUDED | | #ifndef ITCL_H_INCLUDED | |
| #define ITCL_H_INCLUDED | | #define ITCL_H_INCLUDED | |
| | | | |
| #include <tcl.h> | | #include <tcl.h> | |
| | | | |
|
| #if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6) | | #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6) | |
| # error Itcl 4 build requires tcl.h from Tcl 8.6 or later | | # error Itcl 4 build requires tcl.h from Tcl 8.6 or later | |
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| * For C++ compilers, use extern "C" | | * For C++ compilers, use extern "C" | |
| */ | | */ | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
| skipping to change at line 85 | | skipping to change at line 85 | |
| #ifndef TCL_BETA_RELEASE | | #ifndef TCL_BETA_RELEASE | |
| # define TCL_BETA_RELEASE 1 | | # define TCL_BETA_RELEASE 1 | |
| #endif | | #endif | |
| #ifndef TCL_FINAL_RELEASE | | #ifndef TCL_FINAL_RELEASE | |
| # define TCL_FINAL_RELEASE 2 | | # define TCL_FINAL_RELEASE 2 | |
| #endif | | #endif | |
| | | | |
| #define ITCL_MAJOR_VERSION 4 | | #define ITCL_MAJOR_VERSION 4 | |
| #define ITCL_MINOR_VERSION 0 | | #define ITCL_MINOR_VERSION 0 | |
| #define ITCL_RELEASE_LEVEL TCL_FINAL_RELEASE | | #define ITCL_RELEASE_LEVEL TCL_FINAL_RELEASE | |
|
| #define ITCL_RELEASE_SERIAL 0 | | #define ITCL_RELEASE_SERIAL 1 | |
| | | | |
| #define ITCL_VERSION "4.0" | | #define ITCL_VERSION "4.0" | |
|
| #define ITCL_PATCH_LEVEL "4.0.0" | | #define ITCL_PATCH_LEVEL "4.0.1" | |
| | | | |
| /* | | /* | |
| * A special definition used to allow this header file to be included from | | * A special definition used to allow this header file to be included from | |
| * windows resource files so that they can obtain version information. | | * windows resource files so that they can obtain version information. | |
| * RC_INVOKED is defined by default by the windows RC tool. | | * RC_INVOKED is defined by default by the windows RC tool. | |
| * | | * | |
| * Resource compilers don't like all the C stuff, like typedefs and functio
n | | * Resource compilers don't like all the C stuff, like typedefs and functio
n | |
| * declarations, that occur below, so block them out. | | * declarations, that occur below, so block them out. | |
| */ | | */ | |
| | | | |
| | | | |
| skipping to change at line 113 | | skipping to change at line 113 | |
| #ifndef ITCLAPI | | #ifndef ITCLAPI | |
| # if defined(BUILD_itcl) | | # if defined(BUILD_itcl) | |
| # define ITCLAPI MODULE_SCOPE | | # define ITCLAPI MODULE_SCOPE | |
| # else | | # else | |
| # define ITCLAPI extern | | # define ITCLAPI extern | |
| # undef USE_ITCL_STUBS | | # undef USE_ITCL_STUBS | |
| # define USE_ITCL_STUBS 1 | | # define USE_ITCL_STUBS 1 | |
| # endif | | # endif | |
| #endif | | #endif | |
| | | | |
|
| #undef TCL_STORAGE_CLASS | | #if defined(BUILD_itcl) && !defined(STATIC_BUILD) | |
| #ifdef BUILD_itcl | | # define ITCL_EXTERN extern DLLEXPORT | |
| # define TCL_STORAGE_CLASS DLLEXPORT | | | |
| #else | | #else | |
|
| # define TCL_STORAGE_CLASS | | # define ITCL_EXTERN extern | |
| #endif | | #endif | |
| | | | |
|
| EXTERN int Itcl_Init(Tcl_Interp *interp); | | ITCL_EXTERN int Itcl_Init(Tcl_Interp *interp); | |
| EXTERN int Itcl_SafeInit(Tcl_Interp *interp); | | ITCL_EXTERN int Itcl_SafeInit(Tcl_Interp *interp); | |
| | | | |
| /* | | /* | |
| * Protection levels: | | * Protection levels: | |
| * | | * | |
| * ITCL_PUBLIC - accessible from any namespace | | * ITCL_PUBLIC - accessible from any namespace | |
| * ITCL_PROTECTED - accessible from namespace that imports in "protected" m
ode | | * ITCL_PROTECTED - accessible from namespace that imports in "protected" m
ode | |
| * ITCL_PRIVATE - accessible only within the namespace that contains it | | * ITCL_PRIVATE - accessible only within the namespace that contains it | |
| */ | | */ | |
| #define ITCL_PUBLIC 1 | | #define ITCL_PUBLIC 1 | |
| #define ITCL_PROTECTED 2 | | #define ITCL_PROTECTED 2 | |
| | | | |
| skipping to change at line 191 | | skipping to change at line 190 | |
| | | | |
| #ifdef ITCL_PRESERVE_DEBUG | | #ifdef ITCL_PRESERVE_DEBUG | |
| #undef Itcl_PreserveData | | #undef Itcl_PreserveData | |
| #undef Itcl_ReleaseData | | #undef Itcl_ReleaseData | |
| void ItclDbgPreserveData(ClientData cdata, int line, const char *file); | | void ItclDbgPreserveData(ClientData cdata, int line, const char *file); | |
| void ItclDbgReleaseData(ClientData cdata, int line, const char *file); | | void ItclDbgReleaseData(ClientData cdata, int line, const char *file); | |
| #define Itcl_PreserveData(addr) ItclDbgPreserveData(addr, __LINE__, __FILE_
_) | | #define Itcl_PreserveData(addr) ItclDbgPreserveData(addr, __LINE__, __FILE_
_) | |
| #define Itcl_ReleaseData(addr) ItclDbgReleaseData(addr, __LINE__, __FILE__) | | #define Itcl_ReleaseData(addr) ItclDbgReleaseData(addr, __LINE__, __FILE__) | |
| #endif | | #endif | |
| | | | |
|
| #undef TCL_STORAGE_CLASS | | | |
| #define TCL_STORAGE_CLASS DLLIMPORT | | | |
| | | | |
| #endif /* RC_INVOKED */ | | #endif /* RC_INVOKED */ | |
| | | | |
| /* | | /* | |
| * end block for C++ | | * end block for C++ | |
| */ | | */ | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| | | | |
End of changes. 7 change blocks. |
| 12 lines changed or deleted | | 8 lines changed or added | |
|
| itclDecls.h | | itclDecls.h | |
| /* | | /* | |
| * This file is (mostly) automatically generated from itcl.decls. | | * This file is (mostly) automatically generated from itcl.decls. | |
| */ | | */ | |
| | | | |
|
| | | #ifndef _ITCLDECLS | |
| | | #define _ITCLDECLS | |
| | | | |
| #if defined(USE_ITCL_STUBS) | | #if defined(USE_ITCL_STUBS) | |
| | | | |
| ITCLAPI const char *Itcl_InitStubs( | | ITCLAPI const char *Itcl_InitStubs( | |
| Tcl_Interp *, const char *version, int exact); | | Tcl_Interp *, const char *version, int exact); | |
| #else | | #else | |
| | | | |
| #define Itcl_InitStubs(interp, version, exact) Tcl_PkgRequire(interp,"itcl"
,version,exact) | | #define Itcl_InitStubs(interp, version, exact) Tcl_PkgRequire(interp,"itcl"
,version,exact) | |
| | | | |
| #endif | | #endif | |
| | | | |
| /* !BEGIN!: Do not edit below this line. */ | | /* !BEGIN!: Do not edit below this line. */ | |
| | | | |
| #define ITCL_STUBS_EPOCH 0 | | #define ITCL_STUBS_EPOCH 0 | |
| #define ITCL_STUBS_REVISION 144 | | #define ITCL_STUBS_REVISION 144 | |
| | | | |
|
| | | #ifdef __cplusplus | |
| | | extern "C" { | |
| | | #endif | |
| | | | |
| /* | | /* | |
| * Exported function declarations: | | * Exported function declarations: | |
| */ | | */ | |
| | | | |
| /* Slot 0 is reserved */ | | /* Slot 0 is reserved */ | |
| /* Slot 1 is reserved */ | | /* Slot 1 is reserved */ | |
| /* 2 */ | | /* 2 */ | |
| ITCLAPI int Itcl_RegisterC(Tcl_Interp *interp, const char *name, | | ITCLAPI int Itcl_RegisterC(Tcl_Interp *interp, const char *name, | |
| Tcl_CmdProc *proc, ClientData clientData, | | Tcl_CmdProc *proc, ClientData clientData, | |
| Tcl_CmdDeleteProc *deleteProc); | | Tcl_CmdDeleteProc *deleteProc); | |
| | | | |
| skipping to change at line 88 | | skipping to change at line 95 | |
| /* 22 */ | | /* 22 */ | |
| ITCLAPI void Itcl_ReleaseData(ClientData cdata); | | ITCLAPI void Itcl_ReleaseData(ClientData cdata); | |
| /* 23 */ | | /* 23 */ | |
| ITCLAPI Itcl_InterpState Itcl_SaveInterpState(Tcl_Interp *interp, int statu
s); | | ITCLAPI Itcl_InterpState Itcl_SaveInterpState(Tcl_Interp *interp, int statu
s); | |
| /* 24 */ | | /* 24 */ | |
| ITCLAPI int Itcl_RestoreInterpState(Tcl_Interp *interp, | | ITCLAPI int Itcl_RestoreInterpState(Tcl_Interp *interp, | |
| Itcl_InterpState state); | | Itcl_InterpState state); | |
| /* 25 */ | | /* 25 */ | |
| ITCLAPI void Itcl_DiscardInterpState(Itcl_InterpState state); | | ITCLAPI void Itcl_DiscardInterpState(Itcl_InterpState state); | |
| | | | |
|
| typedef struct ItclStubHooks { | | typedef struct { | |
| const struct ItclIntStubs *itclIntStubs; | | const struct ItclIntStubs *itclIntStubs; | |
| } ItclStubHooks; | | } ItclStubHooks; | |
| | | | |
| typedef struct ItclStubs { | | typedef struct ItclStubs { | |
| int magic; | | int magic; | |
| int epoch; | | int epoch; | |
| int revision; | | int revision; | |
|
| const struct ItclStubHooks *hooks; | | const ItclStubHooks *hooks; | |
| | | | |
| void (*reserved0)(void); | | void (*reserved0)(void); | |
| void (*reserved1)(void); | | void (*reserved1)(void); | |
| int (*itcl_RegisterC) (Tcl_Interp *interp, const char *name, Tcl_CmdPro
c *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); /* 2 */ | | int (*itcl_RegisterC) (Tcl_Interp *interp, const char *name, Tcl_CmdPro
c *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); /* 2 */ | |
| int (*itcl_RegisterObjC) (Tcl_Interp *interp, const char *name, Tcl_Obj
CmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); /* 3
*/ | | int (*itcl_RegisterObjC) (Tcl_Interp *interp, const char *name, Tcl_Obj
CmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); /* 3
*/ | |
| int (*itcl_FindC) (Tcl_Interp *interp, const char *name, Tcl_CmdProc **
argProcPtr, Tcl_ObjCmdProc **objProcPtr, ClientData *cDataPtr); /* 4 */ | | int (*itcl_FindC) (Tcl_Interp *interp, const char *name, Tcl_CmdProc **
argProcPtr, Tcl_ObjCmdProc **objProcPtr, ClientData *cDataPtr); /* 4 */ | |
| void (*itcl_InitStack) (Itcl_Stack *stack); /* 5 */ | | void (*itcl_InitStack) (Itcl_Stack *stack); /* 5 */ | |
| void (*itcl_DeleteStack) (Itcl_Stack *stack); /* 6 */ | | void (*itcl_DeleteStack) (Itcl_Stack *stack); /* 6 */ | |
| void (*itcl_PushStack) (ClientData cdata, Itcl_Stack *stack); /* 7 */ | | void (*itcl_PushStack) (ClientData cdata, Itcl_Stack *stack); /* 7 */ | |
| ClientData (*itcl_PopStack) (Itcl_Stack *stack); /* 8 */ | | ClientData (*itcl_PopStack) (Itcl_Stack *stack); /* 8 */ | |
| | | | |
| skipping to change at line 126 | | skipping to change at line 133 | |
| Itcl_ListElem * (*itcl_AppendListElem) (Itcl_ListElem *pos, ClientData
val); /* 18 */ | | Itcl_ListElem * (*itcl_AppendListElem) (Itcl_ListElem *pos, ClientData
val); /* 18 */ | |
| void (*itcl_SetListValue) (Itcl_ListElem *elemPtr, ClientData val); /*
19 */ | | void (*itcl_SetListValue) (Itcl_ListElem *elemPtr, ClientData val); /*
19 */ | |
| void (*itcl_EventuallyFree) (ClientData cdata, Tcl_FreeProc *fproc); /*
20 */ | | void (*itcl_EventuallyFree) (ClientData cdata, Tcl_FreeProc *fproc); /*
20 */ | |
| void (*itcl_PreserveData) (ClientData cdata); /* 21 */ | | void (*itcl_PreserveData) (ClientData cdata); /* 21 */ | |
| void (*itcl_ReleaseData) (ClientData cdata); /* 22 */ | | void (*itcl_ReleaseData) (ClientData cdata); /* 22 */ | |
| Itcl_InterpState (*itcl_SaveInterpState) (Tcl_Interp *interp, int statu
s); /* 23 */ | | Itcl_InterpState (*itcl_SaveInterpState) (Tcl_Interp *interp, int statu
s); /* 23 */ | |
| int (*itcl_RestoreInterpState) (Tcl_Interp *interp, Itcl_InterpState st
ate); /* 24 */ | | int (*itcl_RestoreInterpState) (Tcl_Interp *interp, Itcl_InterpState st
ate); /* 24 */ | |
| void (*itcl_DiscardInterpState) (Itcl_InterpState state); /* 25 */ | | void (*itcl_DiscardInterpState) (Itcl_InterpState state); /* 25 */ | |
| } ItclStubs; | | } ItclStubs; | |
| | | | |
|
| #ifdef __cplusplus | | | |
| extern "C" { | | | |
| #endif | | | |
| extern const ItclStubs *itclStubsPtr; | | extern const ItclStubs *itclStubsPtr; | |
|
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #if defined(USE_ITCL_STUBS) | | #if defined(USE_ITCL_STUBS) | |
| | | | |
| /* | | /* | |
| * Inline function declarations: | | * Inline function declarations: | |
| */ | | */ | |
| | | | |
| | | | |
| skipping to change at line 194 | | skipping to change at line 199 | |
| #define Itcl_SaveInterpState \ | | #define Itcl_SaveInterpState \ | |
| (itclStubsPtr->itcl_SaveInterpState) /* 23 */ | | (itclStubsPtr->itcl_SaveInterpState) /* 23 */ | |
| #define Itcl_RestoreInterpState \ | | #define Itcl_RestoreInterpState \ | |
| (itclStubsPtr->itcl_RestoreInterpState) /* 24 */ | | (itclStubsPtr->itcl_RestoreInterpState) /* 24 */ | |
| #define Itcl_DiscardInterpState \ | | #define Itcl_DiscardInterpState \ | |
| (itclStubsPtr->itcl_DiscardInterpState) /* 25 */ | | (itclStubsPtr->itcl_DiscardInterpState) /* 25 */ | |
| | | | |
| #endif /* defined(USE_ITCL_STUBS) */ | | #endif /* defined(USE_ITCL_STUBS) */ | |
| | | | |
| /* !END!: Do not edit above this line. */ | | /* !END!: Do not edit above this line. */ | |
|
| | | | |
| | | #endif /* _ITCLDECLS */ | |
| | | | |
End of changes. 7 change blocks. |
| 5 lines changed or deleted | | 10 lines changed or added | |
|
| itclInt.h | | itclInt.h | |
| | | | |
| skipping to change at line 41 | | skipping to change at line 41 | |
| #endif | | #endif | |
| | | | |
| #include <string.h> | | #include <string.h> | |
| #include <ctype.h> | | #include <ctype.h> | |
| #include <tclOO.h> | | #include <tclOO.h> | |
| #include "itcl.h" | | #include "itcl.h" | |
| #include "itclMigrate2TclCore.h" | | #include "itclMigrate2TclCore.h" | |
| #include "itclTclIntStubsFcn.h" | | #include "itclTclIntStubsFcn.h" | |
| | | | |
| /* | | /* | |
|
| | | * Utility macros: STRINGIFY takes an argument and wraps it in "" (double | |
| | | * quotation marks). | |
| | | */ | |
| | | | |
| | | #ifndef STRINGIFY | |
| | | # define STRINGIFY(x) STRINGIFY1(x) | |
| | | # define STRINGIFY1(x) #x | |
| | | #endif | |
| | | | |
| | | /* | |
| * Since the Tcl/Tk distribution doesn't perform any asserts, | | * Since the Tcl/Tk distribution doesn't perform any asserts, | |
| * dynamic loading can fail to find the __assert function. | | * dynamic loading can fail to find the __assert function. | |
| * As a workaround, we'll include our own. | | * As a workaround, we'll include our own. | |
| */ | | */ | |
| | | | |
| #undef assert | | #undef assert | |
| #define DEBUG 1 | | #define DEBUG 1 | |
| #ifndef DEBUG | | #ifndef DEBUG | |
| #define assert(EX) ((void)0) | | #define assert(EX) ((void)0) | |
| #else | | #else | |
| | | | |
| skipping to change at line 457 | | skipping to change at line 467 | |
| #define ITCL_SELF_VAR 0x100 /* non-zero => built-in "self" variab
le */ | | #define ITCL_SELF_VAR 0x100 /* non-zero => built-in "self" variab
le */ | |
| #define ITCL_SELFNS_VAR 0x200 /* non-zero => built-in "selfns" | | #define ITCL_SELFNS_VAR 0x200 /* non-zero => built-in "selfns" | |
| * variable */ | | * variable */ | |
| #define ITCL_WIN_VAR 0x400 /* non-zero => built-in "win" variabl
e */ | | #define ITCL_WIN_VAR 0x400 /* non-zero => built-in "win" variabl
e */ | |
| #define ITCL_COMPONENT_VAR 0x800 /* non-zero => component variable */ | | #define ITCL_COMPONENT_VAR 0x800 /* non-zero => component variable */ | |
| #define ITCL_HULL_VAR 0x1000 /* non-zero => built-in "itcl_hull" | | #define ITCL_HULL_VAR 0x1000 /* non-zero => built-in "itcl_hull" | |
| * variable */ | | * variable */ | |
| #define ITCL_OPTION_READONLY 0x2000 /* non-zero => readonly */ | | #define ITCL_OPTION_READONLY 0x2000 /* non-zero => readonly */ | |
| #define ITCL_VARIABLE 0x4000 /* non-zero => normal variable */ | | #define ITCL_VARIABLE 0x4000 /* non-zero => normal variable */ | |
| #define ITCL_TYPE_VARIABLE 0x8000 /* non-zero => typevariable */ | | #define ITCL_TYPE_VARIABLE 0x8000 /* non-zero => typevariable */ | |
|
| | | #define ITCL_OPTION_INITTED 0x10000 /* non-zero => option has been initi | |
| | | alized */ | |
| | | #define ITCL_OPTION_COMP_VAR 0x20000 /* variable to collect option compon | |
| | | ents of extendedclass */ | |
| | | | |
| /* | | /* | |
| * Instance components. | | * Instance components. | |
| */ | | */ | |
| struct ItclVariable; | | struct ItclVariable; | |
| typedef struct ItclComponent { | | typedef struct ItclComponent { | |
| Tcl_Obj *namePtr; /* member name */ | | Tcl_Obj *namePtr; /* member name */ | |
| struct ItclVariable *ivPtr; /* variable for this component */ | | struct ItclVariable *ivPtr; /* variable for this component */ | |
| int flags; | | int flags; | |
| int haveKeptOptions; | | int haveKeptOptions; | |
| | | | |
| skipping to change at line 683 | | skipping to change at line 695 | |
| #endif | | #endif | |
| | | | |
| MODULE_SCOPE Tcl_ObjCmdProc ItclCallCCommand; | | MODULE_SCOPE Tcl_ObjCmdProc ItclCallCCommand; | |
| MODULE_SCOPE Tcl_ObjCmdProc ItclObjectUnknownCommand; | | MODULE_SCOPE Tcl_ObjCmdProc ItclObjectUnknownCommand; | |
| MODULE_SCOPE int ItclCheckCallProc(ClientData clientData, Tcl_Interp *inter
p, | | MODULE_SCOPE int ItclCheckCallProc(ClientData clientData, Tcl_Interp *inter
p, | |
| Tcl_ObjectContext contextPtr, Tcl_CallFrame *framePtr, int *isFinis
hed); | | Tcl_ObjectContext contextPtr, Tcl_CallFrame *framePtr, int *isFinis
hed); | |
| | | | |
| MODULE_SCOPE ItclFoundation *ItclGetFoundation(Tcl_Interp *interp); | | MODULE_SCOPE ItclFoundation *ItclGetFoundation(Tcl_Interp *interp); | |
| MODULE_SCOPE Tcl_ObjCmdProc ItclClassCommandDispatcher; | | MODULE_SCOPE Tcl_ObjCmdProc ItclClassCommandDispatcher; | |
| MODULE_SCOPE Tcl_Command Itcl_CmdAliasProc(Tcl_Interp *interp, | | MODULE_SCOPE Tcl_Command Itcl_CmdAliasProc(Tcl_Interp *interp, | |
|
| Tcl_Namespace *nsPtr, CONST char *cmdName, ClientData clientData); | | Tcl_Namespace *nsPtr, const char *cmdName, ClientData clientData); | |
| MODULE_SCOPE Tcl_Var Itcl_VarAliasProc(Tcl_Interp *interp, | | MODULE_SCOPE Tcl_Var Itcl_VarAliasProc(Tcl_Interp *interp, | |
|
| Tcl_Namespace *nsPtr, CONST char *VarName, ClientData clientData); | | Tcl_Namespace *nsPtr, const char *VarName, ClientData clientData); | |
| MODULE_SCOPE int ItclIsClass(Tcl_Interp *interp, Tcl_Command cmd); | | MODULE_SCOPE int ItclIsClass(Tcl_Interp *interp, Tcl_Command cmd); | |
| MODULE_SCOPE int ItclCheckCallMethod(ClientData clientData, Tcl_Interp *int
erp, | | MODULE_SCOPE int ItclCheckCallMethod(ClientData clientData, Tcl_Interp *int
erp, | |
| Tcl_ObjectContext contextPtr, Tcl_CallFrame *framePtr, int *isFinis
hed); | | Tcl_ObjectContext contextPtr, Tcl_CallFrame *framePtr, int *isFinis
hed); | |
| MODULE_SCOPE int ItclAfterCallMethod(ClientData clientData, Tcl_Interp *int
erp, | | MODULE_SCOPE int ItclAfterCallMethod(ClientData clientData, Tcl_Interp *int
erp, | |
| Tcl_ObjectContext contextPtr, Tcl_Namespace *nsPtr, int result); | | Tcl_ObjectContext contextPtr, Tcl_Namespace *nsPtr, int result); | |
| MODULE_SCOPE void ItclReportObjectUsage(Tcl_Interp *interp, | | MODULE_SCOPE void ItclReportObjectUsage(Tcl_Interp *interp, | |
| ItclObject *contextIoPtr, Tcl_Namespace *callerNsPtr, | | ItclObject *contextIoPtr, Tcl_Namespace *callerNsPtr, | |
| Tcl_Namespace *contextNsPtr); | | Tcl_Namespace *contextNsPtr); | |
| MODULE_SCOPE void ItclGetInfoUsage(Tcl_Interp *interp, Tcl_Obj *objPtr, | | MODULE_SCOPE void ItclGetInfoUsage(Tcl_Interp *interp, Tcl_Obj *objPtr, | |
| ItclObjectInfo *infoPtr); | | ItclObjectInfo *infoPtr); | |
| MODULE_SCOPE int ItclMapMethodNameProc(Tcl_Interp *interp, Tcl_Object oPtr, | | MODULE_SCOPE int ItclMapMethodNameProc(Tcl_Interp *interp, Tcl_Object oPtr, | |
| Tcl_Class *startClsPtr, Tcl_Obj *methodObj); | | Tcl_Class *startClsPtr, Tcl_Obj *methodObj); | |
| MODULE_SCOPE int ItclCreateArgList(Tcl_Interp *interp, const char *str, | | MODULE_SCOPE int ItclCreateArgList(Tcl_Interp *interp, const char *str, | |
| int *argcPtr, int *maxArgcPtr, Tcl_Obj **usagePtr, | | int *argcPtr, int *maxArgcPtr, Tcl_Obj **usagePtr, | |
| ItclArgList **arglistPtrPtr, ItclMemberFunc *imPtr, | | ItclArgList **arglistPtrPtr, ItclMemberFunc *imPtr, | |
| const char *commandName); | | const char *commandName); | |
| MODULE_SCOPE int ItclObjectCmd(ClientData clientData, Tcl_Interp *interp, | | MODULE_SCOPE int ItclObjectCmd(ClientData clientData, Tcl_Interp *interp, | |
| Tcl_Object oPtr, Tcl_Class clsPtr, int objc, Tcl_Obj *const *objv); | | Tcl_Object oPtr, Tcl_Class clsPtr, int objc, Tcl_Obj *const *objv); | |
|
| MODULE_SCOPE int ItclCreateObject (Tcl_Interp *interp, CONST char* name, | | MODULE_SCOPE int ItclCreateObject (Tcl_Interp *interp, const char* name, | |
| ItclClass *iclsPtr, int objc, Tcl_Obj *CONST objv[]); | | ItclClass *iclsPtr, int objc, Tcl_Obj *const objv[]); | |
| MODULE_SCOPE void ItclDeleteObjectVariablesNamespace(Tcl_Interp *interp, | | MODULE_SCOPE void ItclDeleteObjectVariablesNamespace(Tcl_Interp *interp, | |
| ItclObject *ioPtr); | | ItclObject *ioPtr); | |
| MODULE_SCOPE void ItclDeleteClassVariablesNamespace(Tcl_Interp *interp, | | MODULE_SCOPE void ItclDeleteClassVariablesNamespace(Tcl_Interp *interp, | |
| ItclClass *iclsPtr); | | ItclClass *iclsPtr); | |
| MODULE_SCOPE int ItclInfoInit(Tcl_Interp *interp); | | MODULE_SCOPE int ItclInfoInit(Tcl_Interp *interp); | |
| MODULE_SCOPE char * ItclTraceUnsetVar(ClientData clientData, Tcl_Interp *in
terp, | | MODULE_SCOPE char * ItclTraceUnsetVar(ClientData clientData, Tcl_Interp *in
terp, | |
| const char *name1, const char *name2, int flags); | | const char *name1, const char *name2, int flags); | |
| | | | |
| struct Tcl_ResolvedVarInfo; | | struct Tcl_ResolvedVarInfo; | |
|
| MODULE_SCOPE int Itcl_ClassCmdResolver(Tcl_Interp *interp, CONST char* name
, | | MODULE_SCOPE int Itcl_ClassCmdResolver(Tcl_Interp *interp, const char* name
, | |
| Tcl_Namespace *nsPtr, int flags, Tcl_Command *rPtr); | | Tcl_Namespace *nsPtr, int flags, Tcl_Command *rPtr); | |
|
| MODULE_SCOPE int Itcl_ClassVarResolver(Tcl_Interp *interp, CONST char* name
, | | MODULE_SCOPE int Itcl_ClassVarResolver(Tcl_Interp *interp, const char* name
, | |
| Tcl_Namespace *nsPtr, int flags, Tcl_Var *rPtr); | | Tcl_Namespace *nsPtr, int flags, Tcl_Var *rPtr); | |
| MODULE_SCOPE int Itcl_ClassCompiledVarResolver(Tcl_Interp *interp, | | MODULE_SCOPE int Itcl_ClassCompiledVarResolver(Tcl_Interp *interp, | |
|
| CONST char* name, int length, Tcl_Namespace *nsPtr, | | const char* name, int length, Tcl_Namespace *nsPtr, | |
| struct Tcl_ResolvedVarInfo **rPtr); | | struct Tcl_ResolvedVarInfo **rPtr); | |
|
| MODULE_SCOPE int Itcl_ClassCmdResolver2(Tcl_Interp *interp, CONST char* nam
e, | | MODULE_SCOPE int Itcl_ClassCmdResolver2(Tcl_Interp *interp, const char* nam
e, | |
| Tcl_Namespace *nsPtr, int flags, Tcl_Command *rPtr); | | Tcl_Namespace *nsPtr, int flags, Tcl_Command *rPtr); | |
|
| MODULE_SCOPE int Itcl_ClassVarResolver2(Tcl_Interp *interp, CONST char* nam
e, | | MODULE_SCOPE int Itcl_ClassVarResolver2(Tcl_Interp *interp, const char* nam
e, | |
| Tcl_Namespace *nsPtr, int flags, Tcl_Var *rPtr); | | Tcl_Namespace *nsPtr, int flags, Tcl_Var *rPtr); | |
| MODULE_SCOPE int Itcl_ClassCompiledVarResolver2(Tcl_Interp *interp, | | MODULE_SCOPE int Itcl_ClassCompiledVarResolver2(Tcl_Interp *interp, | |
|
| CONST char* name, int length, Tcl_Namespace *nsPtr, | | const char* name, int length, Tcl_Namespace *nsPtr, | |
| struct Tcl_ResolvedVarInfo **rPtr); | | struct Tcl_ResolvedVarInfo **rPtr); | |
| MODULE_SCOPE int ItclSetParserResolver(Tcl_Namespace *nsPtr); | | MODULE_SCOPE int ItclSetParserResolver(Tcl_Namespace *nsPtr); | |
| MODULE_SCOPE void ItclProcErrorProc(Tcl_Interp *interp, Tcl_Obj *procNameOb
j); | | MODULE_SCOPE void ItclProcErrorProc(Tcl_Interp *interp, Tcl_Obj *procNameOb
j); | |
|
| MODULE_SCOPE int ItclClassBaseCmd(ClientData clientData, Tcl_Interp *interp | | | |
| , | | | |
| int flags, int objc, Tcl_Obj *CONST objv[], ItclClass **iclsPtrPtr); | | | |
| MODULE_SCOPE int Itcl_CreateOption (Tcl_Interp *interp, ItclClass *iclsPtr, | | MODULE_SCOPE int Itcl_CreateOption (Tcl_Interp *interp, ItclClass *iclsPtr, | |
| ItclOption *ioptPtr); | | ItclOption *ioptPtr); | |
| MODULE_SCOPE int Itcl_CreateMethodVariable (Tcl_Interp *interp, | | MODULE_SCOPE int Itcl_CreateMethodVariable (Tcl_Interp *interp, | |
| ItclClass *iclsPtr, Tcl_Obj *name, Tcl_Obj *defaultPtr, | | ItclClass *iclsPtr, Tcl_Obj *name, Tcl_Obj *defaultPtr, | |
| Tcl_Obj *callbackPtr, ItclMethodVariable **imvPtr); | | Tcl_Obj *callbackPtr, ItclMethodVariable **imvPtr); | |
| MODULE_SCOPE int DelegationInstall(Tcl_Interp *interp, ItclObject *ioPtr, | | MODULE_SCOPE int DelegationInstall(Tcl_Interp *interp, ItclObject *ioPtr, | |
| ItclClass *iclsPtr); | | ItclClass *iclsPtr); | |
| MODULE_SCOPE const char* ItclGetInstanceVar(Tcl_Interp *interp, | | MODULE_SCOPE const char* ItclGetInstanceVar(Tcl_Interp *interp, | |
| const char *name, const char *name2, ItclObject *contextIoPtr, | | const char *name, const char *name2, ItclObject *contextIoPtr, | |
| ItclClass *contextIclsPtr); | | ItclClass *contextIclsPtr); | |
| MODULE_SCOPE const char* ItclGetCommonInstanceVar(Tcl_Interp *interp, | | MODULE_SCOPE const char* ItclGetCommonInstanceVar(Tcl_Interp *interp, | |
| const char *name, const char *name2, ItclObject *contextIoPtr, | | const char *name, const char *name2, ItclObject *contextIoPtr, | |
| ItclClass *contextIclsPtr); | | ItclClass *contextIclsPtr); | |
|
| MODULE_SCOPE const char* ItclSetInstanceVar(Tcl_Interp *interp, | | | |
| const char *name, const char *name2, const char *value, | | | |
| ItclObject *contextIoPtr, ItclClass *contextIclsPtr); | | | |
| MODULE_SCOPE Tcl_Obj * ItclCapitalize(const char *str); | | | |
| MODULE_SCOPE int ItclCreateMethod(Tcl_Interp* interp, ItclClass *iclsPtr, | | MODULE_SCOPE int ItclCreateMethod(Tcl_Interp* interp, ItclClass *iclsPtr, | |
| Tcl_Obj *namePtr, const char* arglist, const char* body, | | Tcl_Obj *namePtr, const char* arglist, const char* body, | |
| ItclMemberFunc **imPtrPtr); | | ItclMemberFunc **imPtrPtr); | |
|
| MODULE_SCOPE int ItclCreateComponent(Tcl_Interp *interp, ItclClass *iclsPtr | | | |
| , | | | |
| Tcl_Obj *componentPtr, int type, ItclComponent **icPtrPtr); | | | |
| MODULE_SCOPE int Itcl_WidgetParseInit(Tcl_Interp *interp, | | MODULE_SCOPE int Itcl_WidgetParseInit(Tcl_Interp *interp, | |
| ItclObjectInfo *infoPtr); | | ItclObjectInfo *infoPtr); | |
| MODULE_SCOPE void ItclDeleteObjectMetadata(ClientData clientData); | | MODULE_SCOPE void ItclDeleteObjectMetadata(ClientData clientData); | |
| MODULE_SCOPE void ItclDeleteClassMetadata(ClientData clientData); | | MODULE_SCOPE void ItclDeleteClassMetadata(ClientData clientData); | |
| MODULE_SCOPE void ItclDeleteArgList(ItclArgList *arglistPtr); | | MODULE_SCOPE void ItclDeleteArgList(ItclArgList *arglistPtr); | |
| MODULE_SCOPE int Itcl_ClassOptionCmd(ClientData clientData, Tcl_Interp *int
erp, | | MODULE_SCOPE int Itcl_ClassOptionCmd(ClientData clientData, Tcl_Interp *int
erp, | |
|
| int objc, Tcl_Obj *CONST objv[]); | | int objc, Tcl_Obj *const objv[]); | |
| MODULE_SCOPE int DelegatedOptionsInstall(Tcl_Interp *interp, | | MODULE_SCOPE int DelegatedOptionsInstall(Tcl_Interp *interp, | |
| ItclClass *iclsPtr); | | ItclClass *iclsPtr); | |
| MODULE_SCOPE int Itcl_HandleDelegateOptionCmd(Tcl_Interp *interp, | | MODULE_SCOPE int Itcl_HandleDelegateOptionCmd(Tcl_Interp *interp, | |
| ItclObject *ioPtr, ItclClass *iclsPtr, ItclDelegatedOption **idoPtr
Ptr, | | ItclObject *ioPtr, ItclClass *iclsPtr, ItclDelegatedOption **idoPtr
Ptr, | |
|
| int objc, Tcl_Obj *CONST objv[]); | | int objc, Tcl_Obj *const objv[]); | |
| MODULE_SCOPE int Itcl_HandleDelegateMethodCmd(Tcl_Interp *interp, | | MODULE_SCOPE int Itcl_HandleDelegateMethodCmd(Tcl_Interp *interp, | |
| ItclObject *ioPtr, ItclClass *iclsPtr, | | ItclObject *ioPtr, ItclClass *iclsPtr, | |
|
| ItclDelegatedFunction **idmPtrPtr, int objc, Tcl_Obj *CONST objv[]); | | ItclDelegatedFunction **idmPtrPtr, int objc, Tcl_Obj *const objv[]); | |
| MODULE_SCOPE int DelegateFunction(Tcl_Interp *interp, ItclObject *ioPtr, | | MODULE_SCOPE int DelegateFunction(Tcl_Interp *interp, ItclObject *ioPtr, | |
| ItclClass *iclsPtr, Tcl_Obj *componentNamePtr, | | ItclClass *iclsPtr, Tcl_Obj *componentNamePtr, | |
| ItclDelegatedFunction *idmPtr); | | ItclDelegatedFunction *idmPtr); | |
| MODULE_SCOPE int ItclInitObjectMethodVariables(Tcl_Interp *interp, | | MODULE_SCOPE int ItclInitObjectMethodVariables(Tcl_Interp *interp, | |
| ItclObject *ioPtr, ItclClass *iclsPtr, const char *name); | | ItclObject *ioPtr, ItclClass *iclsPtr, const char *name); | |
| MODULE_SCOPE int InitTclOOFunctionPointers(Tcl_Interp *interp); | | MODULE_SCOPE int InitTclOOFunctionPointers(Tcl_Interp *interp); | |
| MODULE_SCOPE ItclOption* ItclNewOption(Tcl_Interp *interp, ItclObject *ioPt
r, | | MODULE_SCOPE ItclOption* ItclNewOption(Tcl_Interp *interp, ItclObject *ioPt
r, | |
| ItclClass *iclsPtr, Tcl_Obj *namePtr, const char *resourceName, | | ItclClass *iclsPtr, Tcl_Obj *namePtr, const char *resourceName, | |
| const char *className, char *init, ItclMemberCode *mCodePtr); | | const char *className, char *init, ItclMemberCode *mCodePtr); | |
| MODULE_SCOPE int ItclParseOption(ItclObjectInfo *infoPtr, Tcl_Interp *inter
p, | | MODULE_SCOPE int ItclParseOption(ItclObjectInfo *infoPtr, Tcl_Interp *inter
p, | |
|
| int objc, Tcl_Obj *CONST objv[], ItclClass *iclsPtr, | | int objc, Tcl_Obj *const objv[], ItclClass *iclsPtr, | |
| ItclObject *ioPtr, ItclOption **ioptPtrPtr); | | ItclObject *ioPtr, ItclOption **ioptPtrPtr); | |
| MODULE_SCOPE void ItclDestroyClassNamesp(ClientData cdata); | | MODULE_SCOPE void ItclDestroyClassNamesp(ClientData cdata); | |
| MODULE_SCOPE int ExpandDelegateAs(Tcl_Interp *interp, ItclObject *ioPtr, | | MODULE_SCOPE int ExpandDelegateAs(Tcl_Interp *interp, ItclObject *ioPtr, | |
| ItclClass *iclsPtr, ItclDelegatedFunction *idmPtr, | | ItclClass *iclsPtr, ItclDelegatedFunction *idmPtr, | |
| const char *funcName, Tcl_Obj *listPtr); | | const char *funcName, Tcl_Obj *listPtr); | |
| MODULE_SCOPE int ItclCheckForInitializedComponents(Tcl_Interp *interp, | | MODULE_SCOPE int ItclCheckForInitializedComponents(Tcl_Interp *interp, | |
| ItclClass *iclsPtr, ItclObject *ioPtr); | | ItclClass *iclsPtr, ItclObject *ioPtr); | |
| MODULE_SCOPE int ItclCreateDelegatedFunction(Tcl_Interp *interp, | | MODULE_SCOPE int ItclCreateDelegatedFunction(Tcl_Interp *interp, | |
| ItclClass *iclsPtr, Tcl_Obj *methodNamePtr, ItclComponent *icPtr, | | ItclClass *iclsPtr, Tcl_Obj *methodNamePtr, ItclComponent *icPtr, | |
| Tcl_Obj *targetPtr, Tcl_Obj *usingPtr, Tcl_Obj *exceptionsPtr, | | Tcl_Obj *targetPtr, Tcl_Obj *usingPtr, Tcl_Obj *exceptionsPtr, | |
| | | | |
End of changes. 18 change blocks. |
| 24 lines changed or deleted | | 28 lines changed or added | |
|
| itclIntDecls.h | | itclIntDecls.h | |
| /* | | /* | |
| * This file is (mostly) automatically generated from itcl.decls. | | * This file is (mostly) automatically generated from itcl.decls. | |
| */ | | */ | |
| | | | |
|
| | | #ifndef _ITCLINTDECLS | |
| | | #define _ITCLINTDECLS | |
| | | | |
| /* !BEGIN!: Do not edit below this line. */ | | /* !BEGIN!: Do not edit below this line. */ | |
| | | | |
| #define ITCLINT_STUBS_EPOCH 0 | | #define ITCLINT_STUBS_EPOCH 0 | |
| #define ITCLINT_STUBS_REVISION 144 | | #define ITCLINT_STUBS_REVISION 144 | |
| | | | |
|
| | | #ifdef __cplusplus | |
| | | extern "C" { | |
| | | #endif | |
| | | | |
| /* | | /* | |
| * Exported function declarations: | | * Exported function declarations: | |
| */ | | */ | |
| | | | |
| /* 0 */ | | /* 0 */ | |
| ITCLAPI int Itcl_IsClassNamespace(Tcl_Namespace *namesp); | | ITCLAPI int Itcl_IsClassNamespace(Tcl_Namespace *namesp); | |
| /* 1 */ | | /* 1 */ | |
| ITCLAPI int Itcl_IsClass(Tcl_Command cmd); | | ITCLAPI int Itcl_IsClass(Tcl_Command cmd); | |
| /* 2 */ | | /* 2 */ | |
| ITCLAPI ItclClass * Itcl_FindClass(Tcl_Interp *interp, const char *path, | | ITCLAPI ItclClass * Itcl_FindClass(Tcl_Interp *interp, const char *path, | |
| | | | |
| skipping to change at line 495 | | skipping to change at line 502 | |
| Tcl_CallFrame *framePtr, | | Tcl_CallFrame *framePtr, | |
| Tcl_Namespace *nsPtr, int isProcCallFrame); | | Tcl_Namespace *nsPtr, int isProcCallFrame); | |
| /* 175 */ | | /* 175 */ | |
| ITCLAPI void Itcl_PopCallFrame(Tcl_Interp *interp); | | ITCLAPI void Itcl_PopCallFrame(Tcl_Interp *interp); | |
| /* 176 */ | | /* 176 */ | |
| ITCLAPI Tcl_CallFrame * Itcl_GetUplevelCallFrame(Tcl_Interp *interp
, | | ITCLAPI Tcl_CallFrame * Itcl_GetUplevelCallFrame(Tcl_Interp *interp
, | |
| int level); | | int level); | |
| /* 177 */ | | /* 177 */ | |
| ITCLAPI Tcl_CallFrame * Itcl_ActivateCallFrame(Tcl_Interp *interp, | | ITCLAPI Tcl_CallFrame * Itcl_ActivateCallFrame(Tcl_Interp *interp, | |
| Tcl_CallFrame *framePtr); | | Tcl_CallFrame *framePtr); | |
|
| | | /* 178 */ | |
| | | ITCLAPI const char* ItclSetInstanceVar(Tcl_Interp *interp, | |
| | | const char *name, const char *name2, | |
| | | const char *value, ItclObject *contextIoPtr, | |
| | | ItclClass *contextIclsPtr); | |
| | | /* 179 */ | |
| | | ITCLAPI Tcl_Obj * ItclCapitalize(const char *str); | |
| | | /* 180 */ | |
| | | ITCLAPI int ItclClassBaseCmd(ClientData clientData, | |
| | | Tcl_Interp *interp, int flags, int objc, | |
| | | Tcl_Obj *const objv[], | |
| | | ItclClass **iclsPtrPtr); | |
| | | /* 181 */ | |
| | | ITCLAPI int ItclCreateComponent(Tcl_Interp *interp, | |
| | | ItclClass *iclsPtr, Tcl_Obj *componentPtr, | |
| | | int type, ItclComponent **icPtrPtr); | |
| | | | |
| typedef struct ItclIntStubs { | | typedef struct ItclIntStubs { | |
| int magic; | | int magic; | |
| int epoch; | | int epoch; | |
| int revision; | | int revision; | |
|
| const struct ItclIntStubHooks *hooks; | | void *hooks; | |
| | | | |
| int (*itcl_IsClassNamespace) (Tcl_Namespace *namesp); /* 0 */ | | int (*itcl_IsClassNamespace) (Tcl_Namespace *namesp); /* 0 */ | |
| int (*itcl_IsClass) (Tcl_Command cmd); /* 1 */ | | int (*itcl_IsClass) (Tcl_Command cmd); /* 1 */ | |
| ItclClass * (*itcl_FindClass) (Tcl_Interp *interp, const char *path, in
t autoload); /* 2 */ | | ItclClass * (*itcl_FindClass) (Tcl_Interp *interp, const char *path, in
t autoload); /* 2 */ | |
| int (*itcl_FindObject) (Tcl_Interp *interp, const char *name, ItclObjec
t **roPtr); /* 3 */ | | int (*itcl_FindObject) (Tcl_Interp *interp, const char *name, ItclObjec
t **roPtr); /* 3 */ | |
| int (*itcl_IsObject) (Tcl_Command cmd); /* 4 */ | | int (*itcl_IsObject) (Tcl_Command cmd); /* 4 */ | |
| int (*itcl_ObjectIsa) (ItclObject *contextObj, ItclClass *cdefn); /* 5
*/ | | int (*itcl_ObjectIsa) (ItclObject *contextObj, ItclClass *cdefn); /* 5
*/ | |
| int (*itcl_Protection) (Tcl_Interp *interp, int newLevel); /* 6 */ | | int (*itcl_Protection) (Tcl_Interp *interp, int newLevel); /* 6 */ | |
| const char * (*itcl_ProtectionStr) (int pLevel); /* 7 */ | | const char * (*itcl_ProtectionStr) (int pLevel); /* 7 */ | |
| int (*itcl_CanAccess) (ItclMemberFunc *memberPtr, Tcl_Namespace *fromNs
Ptr); /* 8 */ | | int (*itcl_CanAccess) (ItclMemberFunc *memberPtr, Tcl_Namespace *fromNs
Ptr); /* 8 */ | |
| | | | |
| skipping to change at line 680 | | skipping to change at line 703 | |
| int (*itcl_NWidgetCmd) (ClientData infoPtr, Tcl_Interp *interp, int obj
c, Tcl_Obj *const objv[]); /* 168 */ | | int (*itcl_NWidgetCmd) (ClientData infoPtr, Tcl_Interp *interp, int obj
c, Tcl_Obj *const objv[]); /* 168 */ | |
| int (*itcl_AddOptionCmd) (ClientData infoPtr, Tcl_Interp *interp, int o
bjc, Tcl_Obj *const objv[]); /* 169 */ | | int (*itcl_AddOptionCmd) (ClientData infoPtr, Tcl_Interp *interp, int o
bjc, Tcl_Obj *const objv[]); /* 169 */ | |
| int (*itcl_AddComponentCmd) (ClientData infoPtr, Tcl_Interp *interp, in
t objc, Tcl_Obj *const objv[]); /* 170 */ | | int (*itcl_AddComponentCmd) (ClientData infoPtr, Tcl_Interp *interp, in
t objc, Tcl_Obj *const objv[]); /* 170 */ | |
| int (*itcl_BiInfoOptionCmd) (ClientData dummy, Tcl_Interp *interp, int
objc, Tcl_Obj *const objv[]); /* 171 */ | | int (*itcl_BiInfoOptionCmd) (ClientData dummy, Tcl_Interp *interp, int
objc, Tcl_Obj *const objv[]); /* 171 */ | |
| int (*itcl_BiInfoComponentCmd) (ClientData dummy, Tcl_Interp *interp, i
nt objc, Tcl_Obj *const objv[]); /* 172 */ | | int (*itcl_BiInfoComponentCmd) (ClientData dummy, Tcl_Interp *interp, i
nt objc, Tcl_Obj *const objv[]); /* 172 */ | |
| int (*itcl_RenameCommand) (Tcl_Interp *interp, const char *oldName, con
st char *newName); /* 173 */ | | int (*itcl_RenameCommand) (Tcl_Interp *interp, const char *oldName, con
st char *newName); /* 173 */ | |
| int (*itcl_PushCallFrame) (Tcl_Interp *interp, Tcl_CallFrame *framePtr,
Tcl_Namespace *nsPtr, int isProcCallFrame); /* 174 */ | | int (*itcl_PushCallFrame) (Tcl_Interp *interp, Tcl_CallFrame *framePtr,
Tcl_Namespace *nsPtr, int isProcCallFrame); /* 174 */ | |
| void (*itcl_PopCallFrame) (Tcl_Interp *interp); /* 175 */ | | void (*itcl_PopCallFrame) (Tcl_Interp *interp); /* 175 */ | |
| Tcl_CallFrame * (*itcl_GetUplevelCallFrame) (Tcl_Interp *interp, int le
vel); /* 176 */ | | Tcl_CallFrame * (*itcl_GetUplevelCallFrame) (Tcl_Interp *interp, int le
vel); /* 176 */ | |
| Tcl_CallFrame * (*itcl_ActivateCallFrame) (Tcl_Interp *interp, Tcl_Call
Frame *framePtr); /* 177 */ | | Tcl_CallFrame * (*itcl_ActivateCallFrame) (Tcl_Interp *interp, Tcl_Call
Frame *framePtr); /* 177 */ | |
|
| | | const char* (*itclSetInstanceVar) (Tcl_Interp *interp, const char *name | |
| | | , const char *name2, const char *value, ItclObject *contextIoPtr, ItclClass | |
| | | *contextIclsPtr); /* 178 */ | |
| | | Tcl_Obj * (*itclCapitalize) (const char *str); /* 179 */ | |
| | | int (*itclClassBaseCmd) (ClientData clientData, Tcl_Interp *interp, int | |
| | | flags, int objc, Tcl_Obj *const objv[], ItclClass **iclsPtrPtr); /* 180 */ | |
| | | int (*itclCreateComponent) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl | |
| | | _Obj *componentPtr, int type, ItclComponent **icPtrPtr); /* 181 */ | |
| } ItclIntStubs; | | } ItclIntStubs; | |
| | | | |
|
| #ifdef __cplusplus | | | |
| extern "C" { | | | |
| #endif | | | |
| extern const ItclIntStubs *itclIntStubsPtr; | | extern const ItclIntStubs *itclIntStubsPtr; | |
|
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #if defined(USE_ITCL_STUBS) | | #if defined(USE_ITCL_STUBS) | |
| | | | |
| /* | | /* | |
| * Inline function declarations: | | * Inline function declarations: | |
| */ | | */ | |
| | | | |
| | | | |
| skipping to change at line 994 | | skipping to change at line 1019 | |
| #define Itcl_RenameCommand \ | | #define Itcl_RenameCommand \ | |
| (itclIntStubsPtr->itcl_RenameCommand) /* 173 */ | | (itclIntStubsPtr->itcl_RenameCommand) /* 173 */ | |
| #define Itcl_PushCallFrame \ | | #define Itcl_PushCallFrame \ | |
| (itclIntStubsPtr->itcl_PushCallFrame) /* 174 */ | | (itclIntStubsPtr->itcl_PushCallFrame) /* 174 */ | |
| #define Itcl_PopCallFrame \ | | #define Itcl_PopCallFrame \ | |
| (itclIntStubsPtr->itcl_PopCallFrame) /* 175 */ | | (itclIntStubsPtr->itcl_PopCallFrame) /* 175 */ | |
| #define Itcl_GetUplevelCallFrame \ | | #define Itcl_GetUplevelCallFrame \ | |
| (itclIntStubsPtr->itcl_GetUplevelCallFrame) /* 176 */ | | (itclIntStubsPtr->itcl_GetUplevelCallFrame) /* 176 */ | |
| #define Itcl_ActivateCallFrame \ | | #define Itcl_ActivateCallFrame \ | |
| (itclIntStubsPtr->itcl_ActivateCallFrame) /* 177 */ | | (itclIntStubsPtr->itcl_ActivateCallFrame) /* 177 */ | |
|
| | | #define ItclSetInstanceVar \ | |
| | | (itclIntStubsPtr->itclSetInstanceVar) /* 178 */ | |
| | | #define ItclCapitalize \ | |
| | | (itclIntStubsPtr->itclCapitalize) /* 179 */ | |
| | | #define ItclClassBaseCmd \ | |
| | | (itclIntStubsPtr->itclClassBaseCmd) /* 180 */ | |
| | | #define ItclCreateComponent \ | |
| | | (itclIntStubsPtr->itclCreateComponent) /* 181 */ | |
| | | | |
| #endif /* defined(USE_ITCL_STUBS) */ | | #endif /* defined(USE_ITCL_STUBS) */ | |
| | | | |
| /* !END!: Do not edit above this line. */ | | /* !END!: Do not edit above this line. */ | |
|
| | | | |
| | | #endif /* _ITCLINTDECLS */ | |
| | | | |
End of changes. 9 change blocks. |
| 4 lines changed or deleted | | 41 lines changed or added | |
|
| tcl.h | | tcl.h | |
| | | | |
| skipping to change at line 59 | | skipping to change at line 59 | |
| * macosx/Tcl.xcode/default.pbxuser (not patchlevel) 1 LOC | | * macosx/Tcl.xcode/default.pbxuser (not patchlevel) 1 LOC | |
| * macosx/Tcl-Common.xcconfig (not patchlevel) 1 LOC | | * macosx/Tcl-Common.xcconfig (not patchlevel) 1 LOC | |
| * 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) | |
| */ | | */ | |
| | | | |
| #define TCL_MAJOR_VERSION 8 | | #define TCL_MAJOR_VERSION 8 | |
| #define TCL_MINOR_VERSION 6 | | #define TCL_MINOR_VERSION 6 | |
| #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_VERSION "8.6" | | #define TCL_VERSION "8.6" | |
|
| #define TCL_PATCH_LEVEL "8.6.1" | | #define TCL_PATCH_LEVEL "8.6.2" | |
| /* | | /* | |
| *-------------------------------------------------------------------------
--- | | *-------------------------------------------------------------------------
--- | |
| * 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__ | | #ifdef _WIN32 | |
| # if defined(_WIN32) || defined(WIN32) || defined(__MINGW32__) || defined | | # ifndef __WIN32__ | |
| (__BORLANDC__) || (defined(__WATCOMC__) && defined(__WINDOWS_386__)) | | | |
| # define __WIN32__ | | # define __WIN32__ | |
|
| # ifndef WIN32 | | # endif | |
| # define WIN32 | | # ifndef WIN32 | |
| # endif | | # define WIN32 | |
| # ifndef _WIN32 | | | |
| # define _WIN32 | | | |
| # endif | | | |
| # endif | | # endif | |
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| * STRICT: See MSDN Article Q83456 | | * STRICT: See MSDN Article Q83456 | |
| */ | | */ | |
| | | | |
|
| #ifdef __WIN32__ | | #ifdef _WIN32 | |
| # ifndef STRICT | | # ifndef STRICT | |
| # define STRICT | | # define STRICT | |
| # endif | | # endif | |
|
| #endif /* __WIN32__ */ | | #endif /* _WIN32 */ | |
| | | | |
| /* | | /* | |
| * Utility macros: STRINGIFY takes an argument and wraps it in "" (double | | * Utility macros: STRINGIFY takes an argument and wraps it in "" (double | |
| * quotation marks), JOIN joins two arguments. | | * quotation marks), JOIN joins two arguments. | |
| */ | | */ | |
| | | | |
| #ifndef STRINGIFY | | #ifndef STRINGIFY | |
| # define STRINGIFY(x) STRINGIFY1(x) | | # define STRINGIFY(x) STRINGIFY1(x) | |
| # define STRINGIFY1(x) #x | | # define STRINGIFY1(x) #x | |
| #endif | | #endif | |
| | | | |
| skipping to change at line 170 | | skipping to change at line 167 | |
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| * Allow a part of Tcl's API to be explicitly marked as deprecated. | | * Allow a part of Tcl's API to be explicitly marked as deprecated. | |
| * | | * | |
| * Used to make TIP 330/336 generate moans even if people use the | | * Used to make TIP 330/336 generate moans even if people use the | |
| * compatibility macros. Change your code, guys! We won't support you forev
er. | | * compatibility macros. Change your code, guys! We won't support you forev
er. | |
| */ | | */ | |
| | | | |
| #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MI
NOR__ >= 1))) | | #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MI
NOR__ >= 1))) | |
|
| # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC__MINOR__ >= 5)) | | # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) | |
| # define TCL_DEPRECATED_API(msg) __attribute__ ((__deprecated__ (msg)
)) | | # define TCL_DEPRECATED_API(msg) __attribute__ ((__deprecated__ (msg)
)) | |
| # else | | # else | |
| # define TCL_DEPRECATED_API(msg) __attribute__ ((__deprecated__)) | | # define TCL_DEPRECATED_API(msg) __attribute__ ((__deprecated__)) | |
| # endif | | # endif | |
| #else | | #else | |
| # define TCL_DEPRECATED_API(msg) /* nothing portable */ | | # define TCL_DEPRECATED_API(msg) /* nothing portable */ | |
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| *-------------------------------------------------------------------------
--- | | *-------------------------------------------------------------------------
--- | |
| | | | |
| skipping to change at line 193 | | skipping to change at line 190 | |
| * windows is for a DLL, which causes the DLLIMPORT and DLLEXPORT macros to
be | | * windows is for a DLL, which causes the DLLIMPORT and DLLEXPORT macros to
be | |
| * nonempty. To build a static library, the macro STATIC_BUILD should be | | * nonempty. To build a static library, the macro STATIC_BUILD should be | |
| * 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) || (defined(__BORLANDC__) && (__
BORLANDC__ >= 0x0550)) || defined(__LCC__) || defined(__WATCOMC__) || (defi
ned(__GNUC__) && defined(__declspec)))) | |
| # define HAVE_DECLSPEC 1 | | # define HAVE_DECLSPEC 1 | |
| # ifdef STATIC_BUILD | | # ifdef STATIC_BUILD | |
| # define DLLIMPORT | | # define DLLIMPORT | |
| # define DLLEXPORT | | # define DLLEXPORT | |
| # ifdef _DLL | | # ifdef _DLL | |
| # define CRTIMPORT __declspec(dllimport) | | # define CRTIMPORT __declspec(dllimport) | |
| # else | | # else | |
| # define CRTIMPORT | | # define CRTIMPORT | |
| # endif | | # endif | |
| # else | | # else | |
| | | | |
| skipping to change at line 317 | | skipping to change at line 314 | |
| # define EXTERN extern TCL_STORAGE_CLASS | | # define EXTERN extern TCL_STORAGE_CLASS | |
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| *-------------------------------------------------------------------------
--- | | *-------------------------------------------------------------------------
--- | |
| * The following code is copied from winnt.h. If we don't replicate it here
, | | * The following code is copied from winnt.h. If we don't replicate it here
, | |
| * then <windows.h> can't be included after tcl.h, since tcl.h also defines | | * then <windows.h> can't be included after tcl.h, since tcl.h also defines | |
| * VOID. This block is skipped under Cygwin and Mingw. | | * VOID. This block is skipped under Cygwin and Mingw. | |
| */ | | */ | |
| | | | |
|
| #if defined(__WIN32__) && !defined(HAVE_WINNT_IGNORE_VOID) | | #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__ && !HAVE_WINNT_IGNORE_VOID */ | | #endif /* _WIN32 && !HAVE_WINNT_IGNORE_VOID */ | |
| | | | |
| /* | | /* | |
| * Macro to use instead of "void" for arguments that must have type "void *
" | | * Macro to use instead of "void" for arguments that must have type "void *
" | |
| * in ANSI C; maps them to type "char *" in non-ANSI systems. | | * in ANSI C; maps them to type "char *" in non-ANSI systems. | |
| */ | | */ | |
| | | | |
| #ifndef __VXWORKS__ | | #ifndef __VXWORKS__ | |
| # ifndef NO_VOID | | # ifndef NO_VOID | |
| # define VOID void | | # define VOID void | |
| # else | | # else | |
| | | | |
| skipping to change at line 392 | | skipping to change at line 389 | |
| * | | * | |
| * The following invariant should hold for any long value 'longVal': | | * The following invariant should hold for any long value 'longVal': | |
| * longVal == Tcl_WideAsLong(Tcl_LongAsWide(longVal)) | | * longVal == Tcl_WideAsLong(Tcl_LongAsWide(longVal)) | |
| * | | * | |
| * Note on converting between Tcl_WideInt and strings. This implementation
(in | | * Note on converting between Tcl_WideInt and strings. This implementation
(in | |
| * tclObj.c) depends on the function | | * tclObj.c) depends on the function | |
| * sprintf(...,"%" TCL_LL_MODIFIER "d",...). | | * sprintf(...,"%" TCL_LL_MODIFIER "d",...). | |
| */ | | */ | |
| | | | |
| #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG) | | #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG) | |
|
| # if defined(__WIN32__) | | # if defined(_WIN32) | |
| # define TCL_WIDE_INT_TYPE __int64 | | # define TCL_WIDE_INT_TYPE __int64 | |
| # ifdef __BORLANDC__ | | # ifdef __BORLANDC__ | |
| # define TCL_LL_MODIFIER "L" | | # define TCL_LL_MODIFIER "L" | |
| # else /* __BORLANDC__ */ | | # else /* __BORLANDC__ */ | |
| # define TCL_LL_MODIFIER "I64" | | # define TCL_LL_MODIFIER "I64" | |
| # endif /* __BORLANDC__ */ | | # endif /* __BORLANDC__ */ | |
| # elif defined(__GNUC__) | | # elif defined(__GNUC__) | |
| # define TCL_WIDE_INT_TYPE long long | | # define TCL_WIDE_INT_TYPE long long | |
| # define TCL_LL_MODIFIER "ll" | | # define TCL_LL_MODIFIER "ll" | |
|
| # else /* ! __WIN32__ && ! __GNUC__ */ | | # else /* ! _WIN32 && ! __GNUC__ */ | |
| /* | | /* | |
| * Don't know what platform it is and configure hasn't discovered what is | | * Don't know what platform it is and configure hasn't discovered what is | |
| * going on for us. Try to guess... | | * going on for us. Try to guess... | |
| */ | | */ | |
| # ifdef NO_LIMITS_H | | # ifdef NO_LIMITS_H | |
| # error please define either TCL_WIDE_INT_TYPE or TCL_WIDE_INT_IS_LO
NG | | # error please define either TCL_WIDE_INT_TYPE or TCL_WIDE_INT_IS_LO
NG | |
| # else /* !NO_LIMITS_H */ | | # else /* !NO_LIMITS_H */ | |
| # include <limits.h> | | # include <limits.h> | |
| # if (INT_MAX < LONG_MAX) | | # if (INT_MAX < LONG_MAX) | |
| # define TCL_WIDE_INT_IS_LONG 1 | | # define TCL_WIDE_INT_IS_LONG 1 | |
| # else | | # else | |
| # define TCL_WIDE_INT_TYPE long long | | # define TCL_WIDE_INT_TYPE long long | |
| # endif | | # endif | |
| # endif /* NO_LIMITS_H */ | | # endif /* NO_LIMITS_H */ | |
|
| # endif /* __WIN32__ */ | | # endif /* _WIN32 */ | |
| #endif /* !TCL_WIDE_INT_TYPE & !TCL_WIDE_INT_IS_LONG */ | | #endif /* !TCL_WIDE_INT_TYPE & !TCL_WIDE_INT_IS_LONG */ | |
| #ifdef TCL_WIDE_INT_IS_LONG | | #ifdef TCL_WIDE_INT_IS_LONG | |
| # undef TCL_WIDE_INT_TYPE | | # undef TCL_WIDE_INT_TYPE | |
| # define TCL_WIDE_INT_TYPE long | | # define TCL_WIDE_INT_TYPE long | |
| #endif /* TCL_WIDE_INT_IS_LONG */ | | #endif /* TCL_WIDE_INT_IS_LONG */ | |
| | | | |
| typedef TCL_WIDE_INT_TYPE Tcl_WideInt; | | typedef TCL_WIDE_INT_TYPE Tcl_WideInt; | |
| typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt; | | typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt; | |
| | | | |
| #ifdef TCL_WIDE_INT_IS_LONG | | #ifdef TCL_WIDE_INT_IS_LONG | |
| | | | |
| skipping to change at line 449 | | skipping to change at line 446 | |
| */ | | */ | |
| # ifndef TCL_LL_MODIFIER | | # ifndef TCL_LL_MODIFIER | |
| # define TCL_LL_MODIFIER "ll" | | # define TCL_LL_MODIFIER "ll" | |
| # endif /* !TCL_LL_MODIFIER */ | | # endif /* !TCL_LL_MODIFIER */ | |
| # define Tcl_WideAsLong(val) ((long)((Tcl_WideInt)(val))) | | # define Tcl_WideAsLong(val) ((long)((Tcl_WideInt)(val))) | |
| # define Tcl_LongAsWide(val) ((Tcl_WideInt)((long)(val))) | | # define Tcl_LongAsWide(val) ((Tcl_WideInt)((long)(val))) | |
| # define Tcl_WideAsDouble(val) ((double)((Tcl_WideInt)(val))) | | # define Tcl_WideAsDouble(val) ((double)((Tcl_WideInt)(val))) | |
| # define Tcl_DoubleAsWide(val) ((Tcl_WideInt)((double)(val))) | | # define Tcl_DoubleAsWide(val) ((Tcl_WideInt)((double)(val))) | |
| #endif /* TCL_WIDE_INT_IS_LONG */ | | #endif /* TCL_WIDE_INT_IS_LONG */ | |
| | | | |
|
| #if defined(__WIN32__) | | #if defined(_WIN32) | |
| # ifdef __BORLANDC__ | | # ifdef __BORLANDC__ | |
| typedef struct stati64 Tcl_StatBuf; | | typedef struct stati64 Tcl_StatBuf; | |
| # elif defined(_WIN64) | | # elif defined(_WIN64) | |
| typedef struct __stat64 Tcl_StatBuf; | | typedef struct __stat64 Tcl_StatBuf; | |
| # elif (defined(_MSC_VER) && (_MSC_VER < 1400)) || defined(_USE_32BIT_TIM
E_T) | | # elif (defined(_MSC_VER) && (_MSC_VER < 1400)) || defined(_USE_32BIT_TIM
E_T) | |
| typedef struct _stati64 Tcl_StatBuf; | | typedef struct _stati64 Tcl_StatBuf; | |
| # else | | # else | |
| typedef struct _stat32i64 Tcl_StatBuf; | | typedef struct _stat32i64 Tcl_StatBuf; | |
| # endif /* _MSC_VER < 1400 */ | | # endif /* _MSC_VER < 1400 */ | |
| #elif defined(__CYGWIN__) | | #elif defined(__CYGWIN__) | |
|
| typedef struct _stat32i64 { | | typedef struct { | |
| dev_t st_dev; | | dev_t st_dev; | |
| unsigned short st_ino; | | unsigned short st_ino; | |
| unsigned short st_mode; | | unsigned short st_mode; | |
| short st_nlink; | | short st_nlink; | |
| short st_uid; | | short st_uid; | |
| short st_gid; | | short st_gid; | |
| /* Here is a 2-byte gap */ | | /* Here is a 2-byte gap */ | |
| dev_t st_rdev; | | dev_t st_rdev; | |
| /* Here is a 4-byte gap */ | | /* Here is a 4-byte gap */ | |
| long long st_size; | | long long st_size; | |
| | | | |
| skipping to change at line 563 | | skipping to change at line 560 | |
| typedef struct Tcl_Var_ *Tcl_Var; | | typedef struct Tcl_Var_ *Tcl_Var; | |
| typedef struct Tcl_ZLibStream_ *Tcl_ZlibStream; | | typedef struct Tcl_ZLibStream_ *Tcl_ZlibStream; | |
| | | | |
| /* | | /* | |
| *-------------------------------------------------------------------------
--- | | *-------------------------------------------------------------------------
--- | |
| * Definition of the interface to functions implementing threads. A functio
n | | * Definition of the interface to functions implementing threads. A functio
n | |
| * following this definition is given to each call of 'Tcl_CreateThread' an
d | | * following this definition is given to each call of 'Tcl_CreateThread' an
d | |
| * will be called as the main fuction of the new thread created by that cal
l. | | * will be called as the main fuction of the new thread created by that cal
l. | |
| */ | | */ | |
| | | | |
|
| #if defined __WIN32__ | | #if defined _WIN32 | |
| typedef unsigned (__stdcall Tcl_ThreadCreateProc) (ClientData clientData); | | typedef unsigned (__stdcall Tcl_ThreadCreateProc) (ClientData clientData); | |
| #else | | #else | |
| typedef void (Tcl_ThreadCreateProc) (ClientData clientData); | | typedef void (Tcl_ThreadCreateProc) (ClientData clientData); | |
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| * Threading function return types used for abstracting away platform | | * Threading function return types used for abstracting away platform | |
| * differences when writing a Tcl_ThreadCreateProc. See the NewThread funct
ion | | * differences when writing a Tcl_ThreadCreateProc. See the NewThread funct
ion | |
| * in generic/tclThreadTest.c for it's usage. | | * in generic/tclThreadTest.c for it's usage. | |
| */ | | */ | |
| | | | |
|
| #if defined __WIN32__ | | #if defined _WIN32 | |
| # define Tcl_ThreadCreateType unsigned __stdcall | | # define Tcl_ThreadCreateType unsigned __stdcall | |
| # define TCL_THREAD_CREATE_RETURN return 0 | | # define TCL_THREAD_CREATE_RETURN return 0 | |
| #else | | #else | |
| # define Tcl_ThreadCreateType void | | # define Tcl_ThreadCreateType void | |
| # define TCL_THREAD_CREATE_RETURN | | # define TCL_THREAD_CREATE_RETURN | |
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| * Definition of values for default stacksize and the possible flags to be | | * Definition of values for default stacksize and the possible flags to be | |
| * given to Tcl_CreateThread. | | * given to Tcl_CreateThread. | |
| | | | |
| skipping to change at line 2429 | | skipping to change at line 2426 | |
| /* | | /* | |
| *-------------------------------------------------------------------------
--- | | *-------------------------------------------------------------------------
--- | |
| * Include the public function declarations that are accessible via the stu
bs | | * Include the public function declarations that are accessible via the stu
bs | |
| * table. | | * table. | |
| */ | | */ | |
| | | | |
| #include "tclDecls.h" | | #include "tclDecls.h" | |
| | | | |
| /* | | /* | |
| * Include platform specific public function declarations that are accessib
le | | * Include platform specific public function declarations that are accessib
le | |
|
| * via the stubs table. | | * via the stubs table. Make all TclOO symbols MODULE_SCOPE (which only | |
| | | * has effect on building it as a shared library). See ticket [3010352]. | |
| */ | | */ | |
| | | | |
|
| | | #if defined(BUILD_tcl) | |
| | | # undef TCLAPI | |
| | | # define TCLAPI MODULE_SCOPE | |
| | | #endif | |
| | | | |
| #include "tclPlatDecls.h" | | #include "tclPlatDecls.h" | |
| | | | |
| /* | | /* | |
| *-------------------------------------------------------------------------
--- | | *-------------------------------------------------------------------------
--- | |
| * The following declarations either map ckalloc and ckfree to malloc and | | * The following declarations either map ckalloc and ckfree to malloc and | |
| * free, or they map them to functions with all sorts of debugging hooks | | * free, or they map them to functions with all sorts of debugging hooks | |
| * defined in tclCkalloc.c. | | * defined in tclCkalloc.c. | |
| */ | | */ | |
| | | | |
| #ifdef TCL_MEM_DEBUG | | #ifdef TCL_MEM_DEBUG | |
| | | | |
End of changes. 19 change blocks. |
| 25 lines changed or deleted | | 27 lines changed or added | |
|
| tclDecls.h | | tclDecls.h | |
| | | | |
| skipping to change at line 34 | | skipping to change at line 34 | |
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| * WARNING: This file is automatically generated by the tools/genStubs.tcl | | * WARNING: This file is automatically generated by the tools/genStubs.tcl | |
| * script. Any modifications to the function declarations below should be
made | | * script. Any modifications to the function declarations below should be
made | |
| * in the generic/tcl.decls script. | | * in the generic/tcl.decls script. | |
| */ | | */ | |
| | | | |
| /* !BEGIN!: Do not edit below this line. */ | | /* !BEGIN!: Do not edit below this line. */ | |
| | | | |
|
| | | #ifdef __cplusplus | |
| | | extern "C" { | |
| | | #endif | |
| | | | |
| /* | | /* | |
| * Exported function declarations: | | * Exported function declarations: | |
| */ | | */ | |
| | | | |
| /* 0 */ | | /* 0 */ | |
| EXTERN int Tcl_PkgProvideEx(Tcl_Interp *interp, | | EXTERN int Tcl_PkgProvideEx(Tcl_Interp *interp, | |
| const char *name, const char *version, | | const char *name, const char *version, | |
| const void *clientData); | | const void *clientData); | |
| /* 1 */ | | /* 1 */ | |
| EXTERN CONST84_RETURN char * Tcl_PkgRequireEx(Tcl_Interp *interp, | | EXTERN CONST84_RETURN char * Tcl_PkgRequireEx(Tcl_Interp *interp, | |
| | | | |
| skipping to change at line 62 | | skipping to change at line 66 | |
| /* 5 */ | | /* 5 */ | |
| EXTERN char * Tcl_Realloc(char *ptr, unsigned int size); | | EXTERN char * Tcl_Realloc(char *ptr, unsigned int size); | |
| /* 6 */ | | /* 6 */ | |
| EXTERN char * Tcl_DbCkalloc(unsigned int size, const char *file, | | EXTERN char * Tcl_DbCkalloc(unsigned int size, const char *file, | |
| int line); | | int line); | |
| /* 7 */ | | /* 7 */ | |
| EXTERN void Tcl_DbCkfree(char *ptr, const char *file, int line); | | EXTERN void Tcl_DbCkfree(char *ptr, const char *file, int line); | |
| /* 8 */ | | /* 8 */ | |
| EXTERN char * Tcl_DbCkrealloc(char *ptr, unsigned int size, | | EXTERN char * Tcl_DbCkrealloc(char *ptr, unsigned int size, | |
| const char *file, int line); | | const char *file, int line); | |
|
| #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | | #if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */ | |
| /* 9 */ | | /* 9 */ | |
| EXTERN void Tcl_CreateFileHandler(int fd, int mask, | | EXTERN void Tcl_CreateFileHandler(int fd, int mask, | |
| Tcl_FileProc *proc, ClientData clientData); | | Tcl_FileProc *proc, ClientData clientData); | |
| #endif /* UNIX */ | | #endif /* UNIX */ | |
| #ifdef MAC_OSX_TCL /* MACOSX */ | | #ifdef MAC_OSX_TCL /* MACOSX */ | |
| /* 9 */ | | /* 9 */ | |
| EXTERN void Tcl_CreateFileHandler(int fd, int mask, | | EXTERN void Tcl_CreateFileHandler(int fd, int mask, | |
| Tcl_FileProc *proc, ClientData clientData); | | Tcl_FileProc *proc, ClientData clientData); | |
| #endif /* MACOSX */ | | #endif /* MACOSX */ | |
|
| #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | | #if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */ | |
| /* 10 */ | | /* 10 */ | |
| EXTERN void Tcl_DeleteFileHandler(int fd); | | EXTERN void Tcl_DeleteFileHandler(int fd); | |
| #endif /* UNIX */ | | #endif /* UNIX */ | |
| #ifdef MAC_OSX_TCL /* MACOSX */ | | #ifdef MAC_OSX_TCL /* MACOSX */ | |
| /* 10 */ | | /* 10 */ | |
| EXTERN void Tcl_DeleteFileHandler(int fd); | | EXTERN void Tcl_DeleteFileHandler(int fd); | |
| #endif /* MACOSX */ | | #endif /* MACOSX */ | |
| /* 11 */ | | /* 11 */ | |
| EXTERN void Tcl_SetTimer(const Tcl_Time *timePtr); | | EXTERN void Tcl_SetTimer(const Tcl_Time *timePtr); | |
| /* 12 */ | | /* 12 */ | |
| | | | |
| skipping to change at line 510 | | skipping to change at line 514 | |
| EXTERN CONST84_RETURN char * Tcl_GetHostName(void); | | EXTERN CONST84_RETURN char * Tcl_GetHostName(void); | |
| /* 163 */ | | /* 163 */ | |
| EXTERN int Tcl_GetInterpPath(Tcl_Interp *askInterp, | | EXTERN int Tcl_GetInterpPath(Tcl_Interp *askInterp, | |
| Tcl_Interp *slaveInterp); | | Tcl_Interp *slaveInterp); | |
| /* 164 */ | | /* 164 */ | |
| EXTERN Tcl_Interp * Tcl_GetMaster(Tcl_Interp *interp); | | EXTERN Tcl_Interp * Tcl_GetMaster(Tcl_Interp *interp); | |
| /* 165 */ | | /* 165 */ | |
| EXTERN const char * Tcl_GetNameOfExecutable(void); | | EXTERN const char * Tcl_GetNameOfExecutable(void); | |
| /* 166 */ | | /* 166 */ | |
| EXTERN Tcl_Obj * Tcl_GetObjResult(Tcl_Interp *interp); | | EXTERN Tcl_Obj * Tcl_GetObjResult(Tcl_Interp *interp); | |
|
| #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | | #if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */ | |
| /* 167 */ | | /* 167 */ | |
| EXTERN int Tcl_GetOpenFile(Tcl_Interp *interp, | | EXTERN int Tcl_GetOpenFile(Tcl_Interp *interp, | |
| const char *chanID, int forWriting, | | const char *chanID, int forWriting, | |
| int checkUsage, ClientData *filePtr); | | int checkUsage, ClientData *filePtr); | |
| #endif /* UNIX */ | | #endif /* UNIX */ | |
| #ifdef MAC_OSX_TCL /* MACOSX */ | | #ifdef MAC_OSX_TCL /* MACOSX */ | |
| /* 167 */ | | /* 167 */ | |
| EXTERN int Tcl_GetOpenFile(Tcl_Interp *interp, | | EXTERN int Tcl_GetOpenFile(Tcl_Interp *interp, | |
| const char *chanID, int forWriting, | | const char *chanID, int forWriting, | |
| int checkUsage, ClientData *filePtr); | | int checkUsage, ClientData *filePtr); | |
| | | | |
| skipping to change at line 1834 | | skipping to change at line 1838 | |
| | | | |
| int (*tcl_PkgProvideEx) (Tcl_Interp *interp, const char *name, const ch
ar *version, const void *clientData); /* 0 */ | | int (*tcl_PkgProvideEx) (Tcl_Interp *interp, const char *name, const ch
ar *version, const void *clientData); /* 0 */ | |
| CONST84_RETURN char * (*tcl_PkgRequireEx) (Tcl_Interp *interp, const ch
ar *name, const char *version, int exact, void *clientDataPtr); /* 1 */ | | CONST84_RETURN char * (*tcl_PkgRequireEx) (Tcl_Interp *interp, const ch
ar *name, const char *version, int exact, void *clientDataPtr); /* 1 */ | |
| void (*tcl_Panic) (const char *format, ...) TCL_FORMAT_PRINTF(1, 2); /*
2 */ | | void (*tcl_Panic) (const char *format, ...) TCL_FORMAT_PRINTF(1, 2); /*
2 */ | |
| char * (*tcl_Alloc) (unsigned int size); /* 3 */ | | char * (*tcl_Alloc) (unsigned int size); /* 3 */ | |
| void (*tcl_Free) (char *ptr); /* 4 */ | | void (*tcl_Free) (char *ptr); /* 4 */ | |
| char * (*tcl_Realloc) (char *ptr, unsigned int size); /* 5 */ | | char * (*tcl_Realloc) (char *ptr, unsigned int size); /* 5 */ | |
| char * (*tcl_DbCkalloc) (unsigned int size, const char *file, int line)
; /* 6 */ | | char * (*tcl_DbCkalloc) (unsigned int size, const char *file, int line)
; /* 6 */ | |
| void (*tcl_DbCkfree) (char *ptr, const char *file, int line); /* 7 */ | | void (*tcl_DbCkfree) (char *ptr, const char *file, int line); /* 7 */ | |
| char * (*tcl_DbCkrealloc) (char *ptr, unsigned int size, const char *fi
le, int line); /* 8 */ | | char * (*tcl_DbCkrealloc) (char *ptr, unsigned int size, const char *fi
le, int line); /* 8 */ | |
|
| #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | | #if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */ | |
| void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, Cl
ientData clientData); /* 9 */ | | void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, Cl
ientData clientData); /* 9 */ | |
| #endif /* UNIX */ | | #endif /* UNIX */ | |
|
| #if defined(__WIN32__) /* WIN */ | | #if defined(_WIN32) /* WIN */ | |
| void (*reserved9)(void); | | void (*reserved9)(void); | |
| #endif /* WIN */ | | #endif /* WIN */ | |
| #ifdef MAC_OSX_TCL /* MACOSX */ | | #ifdef MAC_OSX_TCL /* MACOSX */ | |
| void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, Cl
ientData clientData); /* 9 */ | | void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, Cl
ientData clientData); /* 9 */ | |
| #endif /* MACOSX */ | | #endif /* MACOSX */ | |
|
| #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | | #if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */ | |
| void (*tcl_DeleteFileHandler) (int fd); /* 10 */ | | void (*tcl_DeleteFileHandler) (int fd); /* 10 */ | |
| #endif /* UNIX */ | | #endif /* UNIX */ | |
|
| #if defined(__WIN32__) /* WIN */ | | #if defined(_WIN32) /* WIN */ | |
| void (*reserved10)(void); | | void (*reserved10)(void); | |
| #endif /* WIN */ | | #endif /* WIN */ | |
| #ifdef MAC_OSX_TCL /* MACOSX */ | | #ifdef MAC_OSX_TCL /* MACOSX */ | |
| void (*tcl_DeleteFileHandler) (int fd); /* 10 */ | | void (*tcl_DeleteFileHandler) (int fd); /* 10 */ | |
| #endif /* MACOSX */ | | #endif /* MACOSX */ | |
| void (*tcl_SetTimer) (const Tcl_Time *timePtr); /* 11 */ | | void (*tcl_SetTimer) (const Tcl_Time *timePtr); /* 11 */ | |
| void (*tcl_Sleep) (int ms); /* 12 */ | | void (*tcl_Sleep) (int ms); /* 12 */ | |
| int (*tcl_WaitForEvent) (const Tcl_Time *timePtr); /* 13 */ | | int (*tcl_WaitForEvent) (const Tcl_Time *timePtr); /* 13 */ | |
| int (*tcl_AppendAllObjTypes) (Tcl_Interp *interp, Tcl_Obj *objPtr); /*
14 */ | | int (*tcl_AppendAllObjTypes) (Tcl_Interp *interp, Tcl_Obj *objPtr); /*
14 */ | |
| void (*tcl_AppendStringsToObj) (Tcl_Obj *objPtr, ...); /* 15 */ | | void (*tcl_AppendStringsToObj) (Tcl_Obj *objPtr, ...); /* 15 */ | |
| | | | |
| skipping to change at line 2008 | | skipping to change at line 2012 | |
| int (*tcl_GetChannelOption) (Tcl_Interp *interp, Tcl_Channel chan, cons
t char *optionName, Tcl_DString *dsPtr); /* 157 */ | | int (*tcl_GetChannelOption) (Tcl_Interp *interp, Tcl_Channel chan, cons
t char *optionName, Tcl_DString *dsPtr); /* 157 */ | |
| CONST86 Tcl_ChannelType * (*tcl_GetChannelType) (Tcl_Channel chan); /*
158 */ | | CONST86 Tcl_ChannelType * (*tcl_GetChannelType) (Tcl_Channel chan); /*
158 */ | |
| int (*tcl_GetCommandInfo) (Tcl_Interp *interp, const char *cmdName, Tcl
_CmdInfo *infoPtr); /* 159 */ | | int (*tcl_GetCommandInfo) (Tcl_Interp *interp, const char *cmdName, Tcl
_CmdInfo *infoPtr); /* 159 */ | |
| CONST84_RETURN char * (*tcl_GetCommandName) (Tcl_Interp *interp, Tcl_Co
mmand command); /* 160 */ | | CONST84_RETURN char * (*tcl_GetCommandName) (Tcl_Interp *interp, Tcl_Co
mmand command); /* 160 */ | |
| int (*tcl_GetErrno) (void); /* 161 */ | | int (*tcl_GetErrno) (void); /* 161 */ | |
| CONST84_RETURN char * (*tcl_GetHostName) (void); /* 162 */ | | CONST84_RETURN char * (*tcl_GetHostName) (void); /* 162 */ | |
| int (*tcl_GetInterpPath) (Tcl_Interp *askInterp, Tcl_Interp *slaveInter
p); /* 163 */ | | int (*tcl_GetInterpPath) (Tcl_Interp *askInterp, Tcl_Interp *slaveInter
p); /* 163 */ | |
| Tcl_Interp * (*tcl_GetMaster) (Tcl_Interp *interp); /* 164 */ | | Tcl_Interp * (*tcl_GetMaster) (Tcl_Interp *interp); /* 164 */ | |
| const char * (*tcl_GetNameOfExecutable) (void); /* 165 */ | | const char * (*tcl_GetNameOfExecutable) (void); /* 165 */ | |
| Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp *interp); /* 166 */ | | Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp *interp); /* 166 */ | |
|
| #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | | #if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */ | |
| int (*tcl_GetOpenFile) (Tcl_Interp *interp, const char *chanID, int for
Writing, int checkUsage, ClientData *filePtr); /* 167 */ | | int (*tcl_GetOpenFile) (Tcl_Interp *interp, const char *chanID, int for
Writing, int checkUsage, ClientData *filePtr); /* 167 */ | |
| #endif /* UNIX */ | | #endif /* UNIX */ | |
|
| #if defined(__WIN32__) /* WIN */ | | #if defined(_WIN32) /* WIN */ | |
| void (*reserved167)(void); | | void (*reserved167)(void); | |
| #endif /* WIN */ | | #endif /* WIN */ | |
| #ifdef MAC_OSX_TCL /* MACOSX */ | | #ifdef MAC_OSX_TCL /* MACOSX */ | |
| int (*tcl_GetOpenFile) (Tcl_Interp *interp, const char *chanID, int for
Writing, int checkUsage, ClientData *filePtr); /* 167 */ | | int (*tcl_GetOpenFile) (Tcl_Interp *interp, const char *chanID, int for
Writing, int checkUsage, ClientData *filePtr); /* 167 */ | |
| #endif /* MACOSX */ | | #endif /* MACOSX */ | |
| Tcl_PathType (*tcl_GetPathType) (const char *path); /* 168 */ | | Tcl_PathType (*tcl_GetPathType) (const char *path); /* 168 */ | |
| int (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */ | | int (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */ | |
| int (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */ | | int (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */ | |
| int (*tcl_GetServiceMode) (void); /* 171 */ | | int (*tcl_GetServiceMode) (void); /* 171 */ | |
| Tcl_Interp * (*tcl_GetSlave) (Tcl_Interp *interp, const char *slaveName
); /* 172 */ | | Tcl_Interp * (*tcl_GetSlave) (Tcl_Interp *interp, const char *slaveName
); /* 172 */ | |
| | | | |
| skipping to change at line 2482 | | skipping to change at line 2486 | |
| Tcl_Obj * (*tcl_GetStartupScript) (const char **encodingPtr); /* 623 */ | | Tcl_Obj * (*tcl_GetStartupScript) (const char **encodingPtr); /* 623 */ | |
| int (*tcl_CloseEx) (Tcl_Interp *interp, Tcl_Channel chan, int flags); /
* 624 */ | | int (*tcl_CloseEx) (Tcl_Interp *interp, Tcl_Channel chan, int flags); /
* 624 */ | |
| int (*tcl_NRExprObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Obj *res
ultPtr); /* 625 */ | | int (*tcl_NRExprObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Obj *res
ultPtr); /* 625 */ | |
| int (*tcl_NRSubstObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags);
/* 626 */ | | int (*tcl_NRSubstObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags);
/* 626 */ | |
| int (*tcl_LoadFile) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *
const symv[], int flags, void *procPtrs, Tcl_LoadHandle *handlePtr); /* 627
*/ | | int (*tcl_LoadFile) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *
const symv[], int flags, void *procPtrs, Tcl_LoadHandle *handlePtr); /* 627
*/ | |
| void * (*tcl_FindSymbol) (Tcl_Interp *interp, Tcl_LoadHandle handle, co
nst char *symbol); /* 628 */ | | void * (*tcl_FindSymbol) (Tcl_Interp *interp, Tcl_LoadHandle handle, co
nst char *symbol); /* 628 */ | |
| int (*tcl_FSUnloadFile) (Tcl_Interp *interp, Tcl_LoadHandle handlePtr);
/* 629 */ | | int (*tcl_FSUnloadFile) (Tcl_Interp *interp, Tcl_LoadHandle handlePtr);
/* 629 */ | |
| void (*tcl_ZlibStreamSetCompressionDictionary) (Tcl_ZlibStream zhandle,
Tcl_Obj *compressionDictionaryObj); /* 630 */ | | void (*tcl_ZlibStreamSetCompressionDictionary) (Tcl_ZlibStream zhandle,
Tcl_Obj *compressionDictionaryObj); /* 630 */ | |
| } TclStubs; | | } TclStubs; | |
| | | | |
|
| #ifdef __cplusplus | | | |
| extern "C" { | | | |
| #endif | | | |
| extern const TclStubs *tclStubsPtr; | | extern const TclStubs *tclStubsPtr; | |
|
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #if defined(USE_TCL_STUBS) | | #if defined(USE_TCL_STUBS) | |
| | | | |
| /* | | /* | |
| * Inline function declarations: | | * Inline function declarations: | |
| */ | | */ | |
| | | | |
| | | | |
| skipping to change at line 2514 | | skipping to change at line 2516 | |
| #define Tcl_Free \ | | #define Tcl_Free \ | |
| (tclStubsPtr->tcl_Free) /* 4 */ | | (tclStubsPtr->tcl_Free) /* 4 */ | |
| #define Tcl_Realloc \ | | #define Tcl_Realloc \ | |
| (tclStubsPtr->tcl_Realloc) /* 5 */ | | (tclStubsPtr->tcl_Realloc) /* 5 */ | |
| #define Tcl_DbCkalloc \ | | #define Tcl_DbCkalloc \ | |
| (tclStubsPtr->tcl_DbCkalloc) /* 6 */ | | (tclStubsPtr->tcl_DbCkalloc) /* 6 */ | |
| #define Tcl_DbCkfree \ | | #define Tcl_DbCkfree \ | |
| (tclStubsPtr->tcl_DbCkfree) /* 7 */ | | (tclStubsPtr->tcl_DbCkfree) /* 7 */ | |
| #define Tcl_DbCkrealloc \ | | #define Tcl_DbCkrealloc \ | |
| (tclStubsPtr->tcl_DbCkrealloc) /* 8 */ | | (tclStubsPtr->tcl_DbCkrealloc) /* 8 */ | |
|
| #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | | #if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */ | |
| #define Tcl_CreateFileHandler \ | | #define Tcl_CreateFileHandler \ | |
| (tclStubsPtr->tcl_CreateFileHandler) /* 9 */ | | (tclStubsPtr->tcl_CreateFileHandler) /* 9 */ | |
| #endif /* UNIX */ | | #endif /* UNIX */ | |
| #ifdef MAC_OSX_TCL /* MACOSX */ | | #ifdef MAC_OSX_TCL /* MACOSX */ | |
| #define Tcl_CreateFileHandler \ | | #define Tcl_CreateFileHandler \ | |
| (tclStubsPtr->tcl_CreateFileHandler) /* 9 */ | | (tclStubsPtr->tcl_CreateFileHandler) /* 9 */ | |
| #endif /* MACOSX */ | | #endif /* MACOSX */ | |
|
| #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | | #if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */ | |
| #define Tcl_DeleteFileHandler \ | | #define Tcl_DeleteFileHandler \ | |
| (tclStubsPtr->tcl_DeleteFileHandler) /* 10 */ | | (tclStubsPtr->tcl_DeleteFileHandler) /* 10 */ | |
| #endif /* UNIX */ | | #endif /* UNIX */ | |
| #ifdef MAC_OSX_TCL /* MACOSX */ | | #ifdef MAC_OSX_TCL /* MACOSX */ | |
| #define Tcl_DeleteFileHandler \ | | #define Tcl_DeleteFileHandler \ | |
| (tclStubsPtr->tcl_DeleteFileHandler) /* 10 */ | | (tclStubsPtr->tcl_DeleteFileHandler) /* 10 */ | |
| #endif /* MACOSX */ | | #endif /* MACOSX */ | |
| #define Tcl_SetTimer \ | | #define Tcl_SetTimer \ | |
| (tclStubsPtr->tcl_SetTimer) /* 11 */ | | (tclStubsPtr->tcl_SetTimer) /* 11 */ | |
| #define Tcl_Sleep \ | | #define Tcl_Sleep \ | |
| | | | |
| skipping to change at line 2842 | | skipping to change at line 2844 | |
| #define Tcl_GetHostName \ | | #define Tcl_GetHostName \ | |
| (tclStubsPtr->tcl_GetHostName) /* 162 */ | | (tclStubsPtr->tcl_GetHostName) /* 162 */ | |
| #define Tcl_GetInterpPath \ | | #define Tcl_GetInterpPath \ | |
| (tclStubsPtr->tcl_GetInterpPath) /* 163 */ | | (tclStubsPtr->tcl_GetInterpPath) /* 163 */ | |
| #define Tcl_GetMaster \ | | #define Tcl_GetMaster \ | |
| (tclStubsPtr->tcl_GetMaster) /* 164 */ | | (tclStubsPtr->tcl_GetMaster) /* 164 */ | |
| #define Tcl_GetNameOfExecutable \ | | #define Tcl_GetNameOfExecutable \ | |
| (tclStubsPtr->tcl_GetNameOfExecutable) /* 165 */ | | (tclStubsPtr->tcl_GetNameOfExecutable) /* 165 */ | |
| #define Tcl_GetObjResult \ | | #define Tcl_GetObjResult \ | |
| (tclStubsPtr->tcl_GetObjResult) /* 166 */ | | (tclStubsPtr->tcl_GetObjResult) /* 166 */ | |
|
| #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | | #if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */ | |
| #define Tcl_GetOpenFile \ | | #define Tcl_GetOpenFile \ | |
| (tclStubsPtr->tcl_GetOpenFile) /* 167 */ | | (tclStubsPtr->tcl_GetOpenFile) /* 167 */ | |
| #endif /* UNIX */ | | #endif /* UNIX */ | |
| #ifdef MAC_OSX_TCL /* MACOSX */ | | #ifdef MAC_OSX_TCL /* MACOSX */ | |
| #define Tcl_GetOpenFile \ | | #define Tcl_GetOpenFile \ | |
| (tclStubsPtr->tcl_GetOpenFile) /* 167 */ | | (tclStubsPtr->tcl_GetOpenFile) /* 167 */ | |
| #endif /* MACOSX */ | | #endif /* MACOSX */ | |
| #define Tcl_GetPathType \ | | #define Tcl_GetPathType \ | |
| (tclStubsPtr->tcl_GetPathType) /* 168 */ | | (tclStubsPtr->tcl_GetPathType) /* 168 */ | |
| #define Tcl_Gets \ | | #define Tcl_Gets \ | |
| | | | |
End of changes. 15 change blocks. |
| 15 lines changed or deleted | | 17 lines changed or added | |
|
| tclOODecls.h | | tclOODecls.h | |
| /* | | /* | |
| * This file is (mostly) automatically generated from tclOO.decls. | | * This file is (mostly) automatically generated from tclOO.decls. | |
| */ | | */ | |
| | | | |
| #ifndef _TCLOODECLS | | #ifndef _TCLOODECLS | |
| #define _TCLOODECLS | | #define _TCLOODECLS | |
| | | | |
|
| | | #ifndef TCLAPI | |
| | | # ifdef BUILD_tcl | |
| | | # define TCLAPI extern DLLEXPORT | |
| | | # else | |
| | | # define TCLAPI extern DLLIMPORT | |
| | | # endif | |
| | | #endif | |
| | | | |
| | | #ifdef USE_TCL_STUBS | |
| | | # undef USE_TCLOO_STUBS | |
| | | # define USE_TCLOO_STUBS | |
| | | #endif | |
| | | | |
| /* !BEGIN!: Do not edit below this line. */ | | /* !BEGIN!: Do not edit below this line. */ | |
| | | | |
|
| | | #ifdef __cplusplus | |
| | | extern "C" { | |
| | | #endif | |
| | | | |
| /* | | /* | |
| * Exported function declarations: | | * Exported function declarations: | |
| */ | | */ | |
| | | | |
| /* 0 */ | | /* 0 */ | |
|
| TCLOOAPI Tcl_Object Tcl_CopyObjectInstance(Tcl_Interp *interp, | | TCLAPI Tcl_Object Tcl_CopyObjectInstance(Tcl_Interp *interp, | |
| Tcl_Object sourceObject, | | Tcl_Object sourceObject, | |
| const char *targetName, | | const char *targetName, | |
| const char *targetNamespaceName); | | const char *targetNamespaceName); | |
| /* 1 */ | | /* 1 */ | |
|
| TCLOOAPI Tcl_Object Tcl_GetClassAsObject(Tcl_Class clazz); | | TCLAPI Tcl_Object Tcl_GetClassAsObject(Tcl_Class clazz); | |
| /* 2 */ | | /* 2 */ | |
|
| TCLOOAPI Tcl_Class Tcl_GetObjectAsClass(Tcl_Object object); | | TCLAPI Tcl_Class Tcl_GetObjectAsClass(Tcl_Object object); | |
| /* 3 */ | | /* 3 */ | |
|
| TCLOOAPI Tcl_Command Tcl_GetObjectCommand(Tcl_Object object); | | TCLAPI Tcl_Command Tcl_GetObjectCommand(Tcl_Object object); | |
| /* 4 */ | | /* 4 */ | |
|
| TCLOOAPI Tcl_Object Tcl_GetObjectFromObj(Tcl_Interp *interp, | | TCLAPI Tcl_Object Tcl_GetObjectFromObj(Tcl_Interp *interp, | |
| Tcl_Obj *objPtr); | | Tcl_Obj *objPtr); | |
| /* 5 */ | | /* 5 */ | |
|
| TCLOOAPI Tcl_Namespace * Tcl_GetObjectNamespace(Tcl_Object object); | | TCLAPI Tcl_Namespace * Tcl_GetObjectNamespace(Tcl_Object object); | |
| /* 6 */ | | /* 6 */ | |
|
| TCLOOAPI Tcl_Class Tcl_MethodDeclarerClass(Tcl_Method method); | | TCLAPI Tcl_Class Tcl_MethodDeclarerClass(Tcl_Method method); | |
| /* 7 */ | | /* 7 */ | |
|
| TCLOOAPI Tcl_Object Tcl_MethodDeclarerObject(Tcl_Method method); | | TCLAPI Tcl_Object Tcl_MethodDeclarerObject(Tcl_Method method); | |
| /* 8 */ | | /* 8 */ | |
|
| TCLOOAPI int Tcl_MethodIsPublic(Tcl_Method method); | | TCLAPI int Tcl_MethodIsPublic(Tcl_Method method); | |
| /* 9 */ | | /* 9 */ | |
|
| TCLOOAPI int Tcl_MethodIsType(Tcl_Method method, | | TCLAPI int Tcl_MethodIsType(Tcl_Method method, | |
| const Tcl_MethodType *typePtr, | | const Tcl_MethodType *typePtr, | |
| ClientData *clientDataPtr); | | ClientData *clientDataPtr); | |
| /* 10 */ | | /* 10 */ | |
|
| TCLOOAPI Tcl_Obj * Tcl_MethodName(Tcl_Method method); | | TCLAPI Tcl_Obj * Tcl_MethodName(Tcl_Method method); | |
| /* 11 */ | | /* 11 */ | |
|
| TCLOOAPI Tcl_Method Tcl_NewInstanceMethod(Tcl_Interp *interp, | | TCLAPI Tcl_Method Tcl_NewInstanceMethod(Tcl_Interp *interp, | |
| Tcl_Object object, Tcl_Obj *nameObj, | | Tcl_Object object, Tcl_Obj *nameObj, | |
| int isPublic, const Tcl_MethodType *typePtr, | | int isPublic, const Tcl_MethodType *typePtr, | |
| ClientData clientData); | | ClientData clientData); | |
| /* 12 */ | | /* 12 */ | |
|
| TCLOOAPI Tcl_Method Tcl_NewMethod(Tcl_Interp *interp, Tcl_Class cls, | | TCLAPI Tcl_Method Tcl_NewMethod(Tcl_Interp *interp, Tcl_Class cls, | |
| Tcl_Obj *nameObj, int isPublic, | | Tcl_Obj *nameObj, int isPublic, | |
| const Tcl_MethodType *typePtr, | | const Tcl_MethodType *typePtr, | |
| ClientData clientData); | | ClientData clientData); | |
| /* 13 */ | | /* 13 */ | |
|
| TCLOOAPI Tcl_Object Tcl_NewObjectInstance(Tcl_Interp *interp, | | TCLAPI Tcl_Object Tcl_NewObjectInstance(Tcl_Interp *interp, | |
| Tcl_Class cls, const char *nameStr, | | Tcl_Class cls, const char *nameStr, | |
| const char *nsNameStr, int objc, | | const char *nsNameStr, int objc, | |
| Tcl_Obj *const *objv, int skip); | | Tcl_Obj *const *objv, int skip); | |
| /* 14 */ | | /* 14 */ | |
|
| TCLOOAPI int Tcl_ObjectDeleted(Tcl_Object object); | | TCLAPI int Tcl_ObjectDeleted(Tcl_Object object); | |
| /* 15 */ | | /* 15 */ | |
|
| TCLOOAPI int Tcl_ObjectContextIsFiltering( | | TCLAPI int Tcl_ObjectContextIsFiltering( | |
| Tcl_ObjectContext context); | | Tcl_ObjectContext context); | |
| /* 16 */ | | /* 16 */ | |
|
| TCLOOAPI Tcl_Method Tcl_ObjectContextMethod(Tcl_ObjectContext context); | | TCLAPI Tcl_Method Tcl_ObjectContextMethod(Tcl_ObjectContext context); | |
| /* 17 */ | | /* 17 */ | |
|
| TCLOOAPI Tcl_Object Tcl_ObjectContextObject(Tcl_ObjectContext context); | | TCLAPI Tcl_Object Tcl_ObjectContextObject(Tcl_ObjectContext context); | |
| /* 18 */ | | /* 18 */ | |
|
| TCLOOAPI int Tcl_ObjectContextSkippedArgs( | | TCLAPI int Tcl_ObjectContextSkippedArgs( | |
| Tcl_ObjectContext context); | | Tcl_ObjectContext context); | |
| /* 19 */ | | /* 19 */ | |
|
| TCLOOAPI ClientData Tcl_ClassGetMetadata(Tcl_Class clazz, | | TCLAPI ClientData Tcl_ClassGetMetadata(Tcl_Class clazz, | |
| const Tcl_ObjectMetadataType *typePtr); | | const Tcl_ObjectMetadataType *typePtr); | |
| /* 20 */ | | /* 20 */ | |
|
| TCLOOAPI void Tcl_ClassSetMetadata(Tcl_Class clazz, | | TCLAPI void Tcl_ClassSetMetadata(Tcl_Class clazz, | |
| const Tcl_ObjectMetadataType *typePtr, | | const Tcl_ObjectMetadataType *typePtr, | |
| ClientData metadata); | | ClientData metadata); | |
| /* 21 */ | | /* 21 */ | |
|
| TCLOOAPI ClientData Tcl_ObjectGetMetadata(Tcl_Object object, | | TCLAPI ClientData Tcl_ObjectGetMetadata(Tcl_Object object, | |
| const Tcl_ObjectMetadataType *typePtr); | | const Tcl_ObjectMetadataType *typePtr); | |
| /* 22 */ | | /* 22 */ | |
|
| TCLOOAPI void Tcl_ObjectSetMetadata(Tcl_Object object, | | TCLAPI void Tcl_ObjectSetMetadata(Tcl_Object object, | |
| const Tcl_ObjectMetadataType *typePtr, | | const Tcl_ObjectMetadataType *typePtr, | |
| ClientData metadata); | | ClientData metadata); | |
| /* 23 */ | | /* 23 */ | |
|
| TCLOOAPI int Tcl_ObjectContextInvokeNext(Tcl_Interp *interp, | | TCLAPI int Tcl_ObjectContextInvokeNext(Tcl_Interp *interp, | |
| Tcl_ObjectContext context, int objc, | | Tcl_ObjectContext context, int objc, | |
| Tcl_Obj *const *objv, int skip); | | Tcl_Obj *const *objv, int skip); | |
| /* 24 */ | | /* 24 */ | |
|
| TCLOOAPI Tcl_ObjectMapMethodNameProc * Tcl_ObjectGetMethodNameMapper( | | TCLAPI Tcl_ObjectMapMethodNameProc * Tcl_ObjectGetMethodNameMapper( | |
| Tcl_Object object); | | Tcl_Object object); | |
| /* 25 */ | | /* 25 */ | |
|
| TCLOOAPI void Tcl_ObjectSetMethodNameMapper(Tcl_Object object, | | TCLAPI void Tcl_ObjectSetMethodNameMapper(Tcl_Object object, | |
| Tcl_ObjectMapMethodNameProc *mapMethodNamePr
oc); | | Tcl_ObjectMapMethodNameProc *mapMethodNamePr
oc); | |
| /* 26 */ | | /* 26 */ | |
|
| TCLOOAPI void Tcl_ClassSetConstructor(Tcl_Interp *interp, | | TCLAPI void Tcl_ClassSetConstructor(Tcl_Interp *interp, | |
| Tcl_Class clazz, Tcl_Method method); | | Tcl_Class clazz, Tcl_Method method); | |
| /* 27 */ | | /* 27 */ | |
|
| TCLOOAPI void Tcl_ClassSetDestructor(Tcl_Interp *interp, | | TCLAPI void Tcl_ClassSetDestructor(Tcl_Interp *interp, | |
| Tcl_Class clazz, Tcl_Method method); | | Tcl_Class clazz, Tcl_Method method); | |
| /* 28 */ | | /* 28 */ | |
|
| TCLOOAPI Tcl_Obj * Tcl_GetObjectName(Tcl_Interp *interp, | | TCLAPI Tcl_Obj * Tcl_GetObjectName(Tcl_Interp *interp, | |
| Tcl_Object object); | | Tcl_Object object); | |
| | | | |
| typedef struct { | | typedef struct { | |
| const struct TclOOIntStubs *tclOOIntStubs; | | const struct TclOOIntStubs *tclOOIntStubs; | |
| } TclOOStubHooks; | | } TclOOStubHooks; | |
| | | | |
| typedef struct TclOOStubs { | | typedef struct TclOOStubs { | |
| int magic; | | int magic; | |
| const TclOOStubHooks *hooks; | | const TclOOStubHooks *hooks; | |
| | | | |
| | | | |
| skipping to change at line 142 | | skipping to change at line 159 | |
| ClientData (*tcl_ObjectGetMetadata) (Tcl_Object object, const Tcl_Objec
tMetadataType *typePtr); /* 21 */ | | ClientData (*tcl_ObjectGetMetadata) (Tcl_Object object, const Tcl_Objec
tMetadataType *typePtr); /* 21 */ | |
| void (*tcl_ObjectSetMetadata) (Tcl_Object object, const Tcl_ObjectMetad
ataType *typePtr, ClientData metadata); /* 22 */ | | void (*tcl_ObjectSetMetadata) (Tcl_Object object, const Tcl_ObjectMetad
ataType *typePtr, ClientData metadata); /* 22 */ | |
| int (*tcl_ObjectContextInvokeNext) (Tcl_Interp *interp, Tcl_ObjectConte
xt context, int objc, Tcl_Obj *const *objv, int skip); /* 23 */ | | int (*tcl_ObjectContextInvokeNext) (Tcl_Interp *interp, Tcl_ObjectConte
xt context, int objc, Tcl_Obj *const *objv, int skip); /* 23 */ | |
| Tcl_ObjectMapMethodNameProc * (*tcl_ObjectGetMethodNameMapper) (Tcl_Obj
ect object); /* 24 */ | | Tcl_ObjectMapMethodNameProc * (*tcl_ObjectGetMethodNameMapper) (Tcl_Obj
ect object); /* 24 */ | |
| void (*tcl_ObjectSetMethodNameMapper) (Tcl_Object object, Tcl_ObjectMap
MethodNameProc *mapMethodNameProc); /* 25 */ | | void (*tcl_ObjectSetMethodNameMapper) (Tcl_Object object, Tcl_ObjectMap
MethodNameProc *mapMethodNameProc); /* 25 */ | |
| void (*tcl_ClassSetConstructor) (Tcl_Interp *interp, Tcl_Class clazz, T
cl_Method method); /* 26 */ | | void (*tcl_ClassSetConstructor) (Tcl_Interp *interp, Tcl_Class clazz, T
cl_Method method); /* 26 */ | |
| void (*tcl_ClassSetDestructor) (Tcl_Interp *interp, Tcl_Class clazz, Tc
l_Method method); /* 27 */ | | void (*tcl_ClassSetDestructor) (Tcl_Interp *interp, Tcl_Class clazz, Tc
l_Method method); /* 27 */ | |
| Tcl_Obj * (*tcl_GetObjectName) (Tcl_Interp *interp, Tcl_Object object);
/* 28 */ | | Tcl_Obj * (*tcl_GetObjectName) (Tcl_Interp *interp, Tcl_Object object);
/* 28 */ | |
| } TclOOStubs; | | } TclOOStubs; | |
| | | | |
|
| #ifdef __cplusplus | | | |
| extern "C" { | | | |
| #endif | | | |
| extern const TclOOStubs *tclOOStubsPtr; | | extern const TclOOStubs *tclOOStubsPtr; | |
|
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #if defined(USE_TCLOO_STUBS) | | #if defined(USE_TCLOO_STUBS) | |
| | | | |
| /* | | /* | |
| * Inline function declarations: | | * Inline function declarations: | |
| */ | | */ | |
| | | | |
| | | | |
| skipping to change at line 218 | | skipping to change at line 233 | |
| #define Tcl_ClassSetConstructor \ | | #define Tcl_ClassSetConstructor \ | |
| (tclOOStubsPtr->tcl_ClassSetConstructor) /* 26 */ | | (tclOOStubsPtr->tcl_ClassSetConstructor) /* 26 */ | |
| #define Tcl_ClassSetDestructor \ | | #define Tcl_ClassSetDestructor \ | |
| (tclOOStubsPtr->tcl_ClassSetDestructor) /* 27 */ | | (tclOOStubsPtr->tcl_ClassSetDestructor) /* 27 */ | |
| #define Tcl_GetObjectName \ | | #define Tcl_GetObjectName \ | |
| (tclOOStubsPtr->tcl_GetObjectName) /* 28 */ | | (tclOOStubsPtr->tcl_GetObjectName) /* 28 */ | |
| | | | |
| #endif /* defined(USE_TCLOO_STUBS) */ | | #endif /* defined(USE_TCLOO_STUBS) */ | |
| | | | |
| /* !END!: Do not edit above this line. */ | | /* !END!: Do not edit above this line. */ | |
|
| | | | |
| #endif /* _TCLOODECLS */ | | #endif /* _TCLOODECLS */ | |
| | | | |
End of changes. 34 change blocks. |
| 32 lines changed or deleted | | 48 lines changed or added | |
|
| tclPlatDecls.h | | tclPlatDecls.h | |
| | | | |
| skipping to change at line 45 | | skipping to change at line 45 | |
| # if defined(_UNICODE) | | # if defined(_UNICODE) | |
| typedef wchar_t TCHAR; | | typedef wchar_t TCHAR; | |
| # else | | # else | |
| typedef char TCHAR; | | typedef char TCHAR; | |
| # endif | | # endif | |
| # define _TCHAR_DEFINED | | # define _TCHAR_DEFINED | |
| #endif | | #endif | |
| | | | |
| /* !BEGIN!: Do not edit below this line. */ | | /* !BEGIN!: Do not edit below this line. */ | |
| | | | |
|
| | | #ifdef __cplusplus | |
| | | extern "C" { | |
| | | #endif | |
| | | | |
| /* | | /* | |
| * Exported function declarations: | | * Exported function declarations: | |
| */ | | */ | |
| | | | |
|
| #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ | | #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */ | |
| /* 0 */ | | /* 0 */ | |
| EXTERN TCHAR * Tcl_WinUtfToTChar(const char *str, int len, | | EXTERN TCHAR * Tcl_WinUtfToTChar(const char *str, int len, | |
| Tcl_DString *dsPtr); | | Tcl_DString *dsPtr); | |
| /* 1 */ | | /* 1 */ | |
| EXTERN char * Tcl_WinTCharToUtf(const TCHAR *str, int len, | | EXTERN char * Tcl_WinTCharToUtf(const TCHAR *str, int len, | |
| Tcl_DString *dsPtr); | | Tcl_DString *dsPtr); | |
| #endif /* WIN */ | | #endif /* WIN */ | |
| #ifdef MAC_OSX_TCL /* MACOSX */ | | #ifdef MAC_OSX_TCL /* MACOSX */ | |
| /* 0 */ | | /* 0 */ | |
| EXTERN int Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp, | | EXTERN int Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp, | |
| | | | |
| skipping to change at line 74 | | skipping to change at line 78 | |
| Tcl_Interp *interp, const char *bundleName, | | Tcl_Interp *interp, const char *bundleName, | |
| const char *bundleVersion, | | const char *bundleVersion, | |
| int hasResourceFile, int maxPathLen, | | int hasResourceFile, int maxPathLen, | |
| char *libraryPath); | | char *libraryPath); | |
| #endif /* MACOSX */ | | #endif /* MACOSX */ | |
| | | | |
| typedef struct TclPlatStubs { | | typedef struct TclPlatStubs { | |
| int magic; | | int magic; | |
| void *hooks; | | void *hooks; | |
| | | | |
|
| #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ | | #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */ | |
| TCHAR * (*tcl_WinUtfToTChar) (const char *str, int len, Tcl_DString *ds
Ptr); /* 0 */ | | TCHAR * (*tcl_WinUtfToTChar) (const char *str, int len, Tcl_DString *ds
Ptr); /* 0 */ | |
| char * (*tcl_WinTCharToUtf) (const TCHAR *str, int len, Tcl_DString *ds
Ptr); /* 1 */ | | char * (*tcl_WinTCharToUtf) (const TCHAR *str, int len, Tcl_DString *ds
Ptr); /* 1 */ | |
| #endif /* WIN */ | | #endif /* WIN */ | |
| #ifdef MAC_OSX_TCL /* MACOSX */ | | #ifdef MAC_OSX_TCL /* MACOSX */ | |
| int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *b
undleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */ | | int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *b
undleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */ | |
| int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, cons
t char *bundleName, const char *bundleVersion, int hasResourceFile, int max
PathLen, char *libraryPath); /* 1 */ | | int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, cons
t char *bundleName, const char *bundleVersion, int hasResourceFile, int max
PathLen, char *libraryPath); /* 1 */ | |
| #endif /* MACOSX */ | | #endif /* MACOSX */ | |
| } TclPlatStubs; | | } TclPlatStubs; | |
| | | | |
|
| #ifdef __cplusplus | | | |
| extern "C" { | | | |
| #endif | | | |
| extern const TclPlatStubs *tclPlatStubsPtr; | | extern const TclPlatStubs *tclPlatStubsPtr; | |
|
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #if defined(USE_TCL_STUBS) | | #if defined(USE_TCL_STUBS) | |
| | | | |
| /* | | /* | |
| * Inline function declarations: | | * Inline function declarations: | |
| */ | | */ | |
| | | | |
|
| #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ | | #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */ | |
| #define Tcl_WinUtfToTChar \ | | #define Tcl_WinUtfToTChar \ | |
| (tclPlatStubsPtr->tcl_WinUtfToTChar) /* 0 */ | | (tclPlatStubsPtr->tcl_WinUtfToTChar) /* 0 */ | |
| #define Tcl_WinTCharToUtf \ | | #define Tcl_WinTCharToUtf \ | |
| (tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */ | | (tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */ | |
| #endif /* WIN */ | | #endif /* WIN */ | |
| #ifdef MAC_OSX_TCL /* MACOSX */ | | #ifdef MAC_OSX_TCL /* MACOSX */ | |
| #define Tcl_MacOSXOpenBundleResources \ | | #define Tcl_MacOSXOpenBundleResources \ | |
| (tclPlatStubsPtr->tcl_MacOSXOpenBundleResources) /* 0 */ | | (tclPlatStubsPtr->tcl_MacOSXOpenBundleResources) /* 0 */ | |
| #define Tcl_MacOSXOpenVersionedBundleResources \ | | #define Tcl_MacOSXOpenVersionedBundleResources \ | |
| (tclPlatStubsPtr->tcl_MacOSXOpenVersionedBundleResources) /* 1 */ | | (tclPlatStubsPtr->tcl_MacOSXOpenVersionedBundleResources) /* 1 */ | |
| | | | |
End of changes. 6 change blocks. |
| 6 lines changed or deleted | | 8 lines changed or added | |
|