diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-06-02 08:12:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-06-02 08:12:38 (GMT) |
| commit | 21dfa74b037c4630be374887a1579c078fd99193 (patch) | |
| tree | 1601cdbe0f43c015bfcb743565108c36f488e67b /generic/tclInt.h | |
| parent | 3f0e8d6265db0d5853ab55de2ead9a045c678b6e (diff) | |
| parent | 9220ca224bafcb35a09f48838501d36ab69762e9 (diff) | |
| download | tcl-21dfa74b037c4630be374887a1579c078fd99193.zip tcl-21dfa74b037c4630be374887a1579c078fd99193.tar.gz tcl-21dfa74b037c4630be374887a1579c078fd99193.tar.bz2 | |
Merge core-8-6-branch. This removes the work currently being done in "sebres-8-6-clock-speedup-cr1" branch, but that will be merged again as soon as the work is done.
All other changes in "trunk" since then (e.g. the INST_STR_CONCAT1 performance improvement, and the removal of SunOS-4) are retained.
Diffstat (limited to 'generic/tclInt.h')
| -rw-r--r-- | generic/tclInt.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index e1ddb36..14d7179 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -2914,7 +2914,6 @@ MODULE_SCOPE int TclFindDictElement(Tcl_Interp *interp, const char *dict, int dictLength, const char **elementPtr, const char **nextPtr, int *sizePtr, int *literalPtr); -MODULE_SCOPE Tcl_Obj * Tcl_DictObjSmartRef(Tcl_Interp *interp, Tcl_Obj *); /* TIP #280 - Modified token based evulation, with line information. */ MODULE_SCOPE int TclEvalEx(Tcl_Interp *interp, const char *script, int numBytes, int flags, int line, @@ -3198,22 +3197,10 @@ MODULE_SCOPE int TclpLoadMemory(Tcl_Interp *interp, void *buffer, MODULE_SCOPE void TclInitThreadStorage(void); MODULE_SCOPE void TclFinalizeThreadDataThread(void); MODULE_SCOPE void TclFinalizeThreadStorage(void); - #ifdef TCL_WIDE_CLICKS MODULE_SCOPE Tcl_WideInt TclpGetWideClicks(void); MODULE_SCOPE double TclpWideClicksToNanoseconds(Tcl_WideInt clicks); -MODULE_SCOPE double TclpWideClickInMicrosec(void); -#else -# ifdef _WIN32 -# define TCL_WIDE_CLICKS 1 -MODULE_SCOPE Tcl_WideInt TclpGetWideClicks(void); -MODULE_SCOPE double TclpWideClickInMicrosec(void); -# define TclpWideClicksToNanoseconds(clicks) \ - ((double)(clicks) * TclpWideClickInMicrosec() * 1000) -# endif #endif -MODULE_SCOPE Tcl_WideInt TclpGetMicroseconds(void); - MODULE_SCOPE int TclZlibInit(Tcl_Interp *interp); MODULE_SCOPE void * TclpThreadCreateKey(void); MODULE_SCOPE void TclpThreadDeleteKey(void *keyPtr); @@ -3485,9 +3472,6 @@ MODULE_SCOPE int Tcl_ThrowObjCmd(ClientData dummy, Tcl_Interp *interp, MODULE_SCOPE int Tcl_TimeObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); -MODULE_SCOPE int Tcl_TimeRateObjCmd(ClientData clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_TraceObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); @@ -4889,13 +4873,6 @@ typedef struct NRE_callback { #define Tcl_Free(ptr) TclpFree(ptr) #endif -/* - * Other externals. - */ - -MODULE_SCOPE size_t TclEnvEpoch; /* Epoch of the tcl environment - * (if changed with tcl-env). */ - #endif /* _TCLINT */ /* |