diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2025-06-27 10:50:43 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2025-06-27 10:50:43 (GMT) |
| commit | 3e78f23412a2bd1654ad40c85c4e4398986e8074 (patch) | |
| tree | e28b55442f93c0291927f79db72e141ef7a41521 /generic | |
| parent | 38ebfdf672a37bc2bf1de7f9a0db8ce651c59a5c (diff) | |
| parent | 7128c54a02b3dda1c0063875a0c7abdbb7794c99 (diff) | |
| download | tcl-core-compile-uplevel.zip tcl-core-compile-uplevel.tar.gz tcl-core-compile-uplevel.tar.bz2 | |
merge trunkcore-compile-uplevel
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBinary.c | 6 | ||||
| -rw-r--r-- | generic/tclNamesp.c | 10 | ||||
| -rw-r--r-- | generic/tclTest.c | 6 | ||||
| -rw-r--r-- | generic/tclThreadTest.c | 6 |
4 files changed, 19 insertions, 9 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index e02f47e..ad50d29 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -2737,13 +2737,13 @@ BinaryEncodeUu( { Tcl_Obj *resultObj; unsigned char *data, *start, *cursor; - int i, bits, index; + int i, bits; unsigned int n; int lineLength = 61; const unsigned char SingleNewline[] = { UCHAR('\n') }; const unsigned char *wrapchar = SingleNewline; Tcl_Size j, rawLength, offset, count = 0, wrapcharlen = sizeof(SingleNewline); - enum { OPT_MAXLEN, OPT_WRAPCHAR }; + enum { OPT_MAXLEN, OPT_WRAPCHAR } index; static const char *const optStrings[] = { "-maxlen", "-wrapchar", NULL }; if (objc < 2 || objc % 2 != 0) { @@ -2802,8 +2802,6 @@ BinaryEncodeUu( return TCL_ERROR; } break; - default: - TCL_UNREACHABLE(); } } diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index e3b35fb..1138bcd 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -4744,7 +4744,7 @@ NamespaceWhichCmd( static const char *const opts[] = { "-command", "-variable", NULL }; - int lookupType = 0; + enum { OPT_COMMAND, OPT_VARIABLE } lookupType = OPT_COMMAND; Tcl_Obj *resultPtr; if (objc < 2 || objc > 3) { @@ -4769,14 +4769,15 @@ NamespaceWhichCmd( TclNewObj(resultPtr); switch (lookupType) { - case 0:; /* -command */ + case OPT_COMMAND: { Tcl_Command cmd = Tcl_GetCommandFromObj(interp, objv[objc-1]); if (cmd != NULL) { Tcl_GetCommandFullName(interp, cmd, resultPtr); } break; - case 1:; /* -variable */ + } + case OPT_VARIABLE: { Tcl_Var var = Tcl_FindNamespaceVar(interp, TclGetString(objv[objc-1]), NULL, /*flags*/ 0); @@ -4784,8 +4785,7 @@ NamespaceWhichCmd( Tcl_GetVariableFullName(interp, var, resultPtr); } break; - default: - TCL_UNREACHABLE(); + } } Tcl_SetObjResult(interp, resultPtr); return TCL_OK; diff --git a/generic/tclTest.c b/generic/tclTest.c index 2e578dd..1307907 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -41,8 +41,14 @@ /* * Declare external functions used in Windows tests. */ +#ifdef __cplusplus +extern "C" { +#endif DLLEXPORT int Tcltest_Init(Tcl_Interp *interp); DLLEXPORT int Tcltest_SafeInit(Tcl_Interp *interp); +#ifdef __cplusplus +} +#endif /* * Dynamic string shared by TestdcallCmd and DelCallbackProc; used to collect diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c index 90b4ccf..349830b 100644 --- a/generic/tclThreadTest.c +++ b/generic/tclThreadTest.c @@ -138,7 +138,13 @@ static void ThreadFreeProc(void *clientData); static int ThreadDeleteEvent(Tcl_Event *eventPtr, void *clientData); static void ThreadExitProc(void *clientData); +#ifdef __cplusplus +extern "C" { +#endif extern int Tcltest_Init(Tcl_Interp *interp); +#ifdef __cplusplus +} +#endif /* *---------------------------------------------------------------------- |