summaryrefslogtreecommitdiffstats
path: root/generic/tclEvent.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-10-12 10:33:45 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-10-12 10:33:45 (GMT)
commitfa55caf92ab61f36a76de13fb7d7bd1f4f05e3e1 (patch)
tree4b1a657611ba230abb50ae17ad81de1827cc7045 /generic/tclEvent.c
parent01d4153b74001109b7070ca0c59637c518ae86b2 (diff)
parent53fc9a5a6e89fcd4c900863e5d6e083f46cc10c9 (diff)
downloadtcl-fa55caf92ab61f36a76de13fb7d7bd1f4f05e3e1.zip
tcl-fa55caf92ab61f36a76de13fb7d7bd1f4f05e3e1.tar.gz
tcl-fa55caf92ab61f36a76de13fb7d7bd1f4f05e3e1.tar.bz2
Merge trunk
Diffstat (limited to 'generic/tclEvent.c')
-rw-r--r--generic/tclEvent.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 6d80639..bf1c3bb 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -1046,7 +1046,7 @@ Tcl_InitSubsystems(void)
TclInitThreadStorage(); /* Creates hash table for
* thread local storage */
-#if USE_TCLALLOC
+#if defined(USE_TCLALLOC) && USE_TCLALLOC
TclInitAlloc(); /* Process wide mutex init */
#endif
#if TCL_THREADS && defined(USE_THREAD_ALLOC)
@@ -1501,7 +1501,7 @@ Tcl_UpdateObjCmd(
int optionIndex;
int flags = 0; /* Initialized to avoid compiler warning. */
static const char *const updateOptions[] = {"idletasks", NULL};
- enum updateOptions {OPT_IDLETASKS};
+ enum updateOptionsEnum {OPT_IDLETASKS};
if (objc == 1) {
flags = TCL_ALL_EVENTS|TCL_DONT_WAIT;
@@ -1510,7 +1510,7 @@ Tcl_UpdateObjCmd(
"option", 0, &optionIndex) != TCL_OK) {
return TCL_ERROR;
}
- switch ((enum updateOptions) optionIndex) {
+ switch ((enum updateOptionsEnum) optionIndex) {
case OPT_IDLETASKS:
flags = TCL_WINDOW_EVENTS|TCL_IDLE_EVENTS|TCL_DONT_WAIT;
break;