summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-10-04 15:56:08 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-10-04 15:56:08 (GMT)
commit3f371a5084c05daba396645abd9a25deb3d023d1 (patch)
tree7f98e1f7b13fe76571100ebb1a40ed254ff73dcc
parent5d3af5f62717c5ddd028c528ff1f89d481b5e63d (diff)
downloadtcl-3f371a5084c05daba396645abd9a25deb3d023d1.zip
tcl-3f371a5084c05daba396645abd9a25deb3d023d1.tar.gz
tcl-3f371a5084c05daba396645abd9a25deb3d023d1.tar.bz2
Fix g++ warning: tclEvent.c:1519:10: warning: declaration of ‘enum Tcl_VwaitObjCmd(void*, Tcl_Interp*, int, Tcl_Obj* const*)::options’ shadows a previous local [-Wshadow]
-rw-r--r--generic/tclEvent.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 183ac82..1e2e7bf 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -1511,12 +1511,12 @@ Tcl_VwaitObjCmd(
Tcl_Channel chan;
Tcl_WideInt diff = -1;
VwaitItem localItems[32], *vwaitItems = localItems;
- static const char *const options[] = {
+ static const char *const vWaitOptionStrings[] = {
"-all", "-extended", "-nofileevents", "-noidleevents",
"-notimerevents", "-nowindowevents", "-readable",
"-timeout", "-variable", "-writable", "--", NULL
};
- enum options {
+ enum vWaitOptions {
OPT_ALL, OPT_EXTD, OPT_NO_FEVTS, OPT_NO_IEVTS,
OPT_NO_TEVTS, OPT_NO_WEVTS, OPT_READABLE,
OPT_TIMEOUT, OPT_VARIABLE, OPT_WRITABLE, OPT_LAST
@@ -1541,7 +1541,7 @@ Tcl_VwaitObjCmd(
if (name[0] != '-') {
break;
}
- if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0,
+ if (Tcl_GetIndexFromObj(interp, objv[i], vWaitOptionStrings, "option", 0,
&index) != TCL_OK) {
result = TCL_ERROR;
goto done;
@@ -1570,7 +1570,7 @@ Tcl_VwaitObjCmd(
needArg:
Tcl_ResetResult(interp);
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
- "argument required for \"%s\"", options[index]));
+ "argument required for \"%s\"", vWaitOptionStrings[index]));
Tcl_SetErrorCode(interp, "TCL", "EVENT", "ARGUMENT", NULL);
result = TCL_ERROR;
goto done;