diff options
| author | griffin <briang42@easystreet.net> | 2023-05-24 23:17:17 (GMT) |
|---|---|---|
| committer | griffin <briang42@easystreet.net> | 2023-05-24 23:17:17 (GMT) |
| commit | ba261e8e87cd9fb904172ca5a43fadb8f163666a (patch) | |
| tree | 07f644f0eb19d93b953c156179e27db3c292384f /unix | |
| parent | c3f8318a3f328bd39244bc8f88ed606848ec5b85 (diff) | |
| parent | 231fd112f959c258117188b044681643f30129f1 (diff) | |
| download | tcl-ba261e8e87cd9fb904172ca5a43fadb8f163666a.zip tcl-ba261e8e87cd9fb904172ca5a43fadb8f163666a.tar.gz tcl-ba261e8e87cd9fb904172ca5a43fadb8f163666a.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 2 | ||||
| -rw-r--r-- | unix/tclUnixThrd.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index b0d6e83..5b6c542 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -2450,7 +2450,7 @@ html-tk: ${NATIVE_TCLSH} @EXTRA_BUILD_HTML@ BUILD_HTML = \ - @${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl \ + @${NATIVE_TCLSH} -encoding utf-8 $(TOOL_DIR)/tcltk-man2html.tcl \ --useversion=$(MAJOR_VERSION).$(MINOR_VERSION) \ --htmldir="$(HTML_INSTALL_DIR)" \ --srcdir=$(TOP_DIR) $(BUILD_HTML_FLAGS) diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c index cf3b7a1..5d357c9 100644 --- a/unix/tclUnixThrd.c +++ b/unix/tclUnixThrd.c @@ -214,7 +214,7 @@ TclpThreadCreate( Tcl_ThreadId *idPtr, /* Return, the ID of the thread */ Tcl_ThreadCreateProc *proc, /* Main() function of the thread */ void *clientData, /* The one argument to Main() */ - size_t stackSize, /* Size of stack for the new thread */ + TCL_HASH_TYPE stackSize, /* Size of stack for the new thread */ int flags) /* Flags controlling behaviour of the new * thread. */ { @@ -228,7 +228,7 @@ TclpThreadCreate( #ifdef HAVE_PTHREAD_ATTR_SETSTACKSIZE if (stackSize != TCL_THREAD_STACK_DEFAULT) { - pthread_attr_setstacksize(&attr, stackSize); + pthread_attr_setstacksize(&attr, (size_t)stackSize); #ifdef TCL_THREAD_STACK_MIN } else { /* @@ -247,7 +247,7 @@ TclpThreadCreate( result = pthread_attr_getstacksize(&attr, &size); if (!result && (size < TCL_THREAD_STACK_MIN)) { - pthread_attr_setstacksize(&attr, (size_t) TCL_THREAD_STACK_MIN); + pthread_attr_setstacksize(&attr, (size_t)TCL_THREAD_STACK_MIN); } #endif /* TCL_THREAD_STACK_MIN */ } |