diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-16 16:59:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-16 16:59:34 (GMT) |
| commit | 81a213ed4ce77b15fbc6d5d97cc1235b689ad482 (patch) | |
| tree | 02de1ac6dd6c22c81c4c8e7163f777b90183db97 /generic/tclTest.c | |
| parent | 31b544baefc9bf84fded3c7dfb98da9db1032e10 (diff) | |
| parent | 6c20a6ff0d3a2aea218b48df0ff32aafeb23167d (diff) | |
| download | tcl-81a213ed4ce77b15fbc6d5d97cc1235b689ad482.zip tcl-81a213ed4ce77b15fbc6d5d97cc1235b689ad482.tar.gz tcl-81a213ed4ce77b15fbc6d5d97cc1235b689ad482.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclTest.c')
| -rw-r--r-- | generic/tclTest.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index b29bb1c..7eeaca6 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -163,9 +163,7 @@ static TestChannel *firstDetached; static int AsyncHandlerProc(void *clientData, Tcl_Interp *interp, int code); -#if TCL_THREADS static Tcl_ThreadCreateType AsyncThreadProc(void *); -#endif static void CleanupTestSetassocdataTests( void *clientData, Tcl_Interp *interp); static void CmdDelProc1(void *clientData); @@ -821,7 +819,6 @@ TestasyncCmd( Tcl_SetObjResult(interp, Tcl_NewStringObj(argv[3], -1)); Tcl_MutexUnlock(&asyncTestMutex); return code; -#if TCL_THREADS } else if (strcmp(argv[1], "marklater") == 0) { if (argc != 3) { goto wrongNumArgs; @@ -849,12 +846,6 @@ TestasyncCmd( Tcl_AppendResult(interp, "bad option \"", argv[1], "\": must be create, delete, int, mark, or marklater", NULL); return TCL_ERROR; -#else /* !TCL_THREADS */ - } else { - Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be create, delete, int, or mark", NULL); - return TCL_ERROR; -#endif } return TCL_OK; } @@ -920,7 +911,6 @@ AsyncHandlerProc( *---------------------------------------------------------------------- */ -#if TCL_THREADS static Tcl_ThreadCreateType AsyncThreadProc( void *clientData) /* Parameter is the id of a @@ -942,7 +932,6 @@ AsyncThreadProc( Tcl_ExitThread(TCL_OK); TCL_THREAD_CREATE_RETURN; } -#endif static int TestbumpinterpepochObjCmd( @@ -1665,7 +1654,7 @@ TestdoubledigitsObjCmd( status = Tcl_GetDoubleFromObj(interp, objv[1], &d); if (status != TCL_OK) { doubleType = Tcl_GetObjType("double"); - if (Tcl_FetchIntRep(objv[1], doubleType) + if (Tcl_FetchInternalRep(objv[1], doubleType) && TclIsNaN(objv[1]->internalRep.doubleValue)) { status = TCL_OK; memcpy(&d, &(objv[1]->internalRep.doubleValue), sizeof(double)); @@ -1902,7 +1891,7 @@ TestencodingObjCmd( } Tcl_FreeEncoding(encoding); /* Free returned reference */ Tcl_FreeEncoding(encoding); /* Free to match CREATE */ - TclFreeIntRep(objv[2]); /* Free the cached ref */ + TclFreeInternalRep(objv[2]); /* Free the cached ref */ break; } return TCL_OK; @@ -5146,7 +5135,7 @@ TestbytestringObjCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { - int n = 0; + size_t n = 0; const char *p; if (objc != 2) { @@ -5154,7 +5143,7 @@ TestbytestringObjCmd( return TCL_ERROR; } - p = (const char *)TclGetBytesFromObj(interp, objv[1], &n); + p = (const char *)Tcl_GetBytesFromObj(interp, objv[1], &n); if (p == NULL) { return TCL_ERROR; } |