diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-25 14:36:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-25 14:36:42 (GMT) |
| commit | 7b86373c88287718b9c9e03e29233b0ea4d6416e (patch) | |
| tree | 152b9f9db9d0c70be8cb40b5aef2ebc265b7d6dd /unix | |
| parent | f45a52ad97cb88960b37051533ca2ce5f37d4c14 (diff) | |
| parent | fe472174f89b1e1b88ffb459768387c693559ecf (diff) | |
| download | tcl-7b86373c88287718b9c9e03e29233b0ea4d6416e.zip tcl-7b86373c88287718b9c9e03e29233b0ea4d6416e.tar.gz tcl-7b86373c88287718b9c9e03e29233b0ea4d6416e.tar.bz2 | |
Merge trunk
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 3 | ||||
| -rw-r--r-- | unix/configure.ac | 2 | ||||
| -rw-r--r-- | unix/tclConfig.h.in | 3 |
3 files changed, 0 insertions, 8 deletions
diff --git a/unix/configure b/unix/configure index de45627..fcaba97 100755 --- a/unix/configure +++ b/unix/configure @@ -9739,9 +9739,6 @@ done $as_echo "#define USE_VFORK 1" >>confdefs.h -$as_echo "#define TCL_DEFAULT_ENCODING \"utf-8\"" >>confdefs.h - - $as_echo "#define TCL_LOAD_FROM_MEMORY 1" >>confdefs.h diff --git a/unix/configure.ac b/unix/configure.ac index c482fc4..4f90ce7 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -606,8 +606,6 @@ if test "`uname -s`" = "Darwin" ; then AC_CHECK_FUNCS(OSSpinLockLock) fi AC_DEFINE(USE_VFORK, 1, [Should we use vfork() instead of fork()?]) - AC_DEFINE(TCL_DEFAULT_ENCODING, "utf-8", - [Are we to override what our default encoding is?]) AC_DEFINE(TCL_LOAD_FROM_MEMORY, 1, [Can this platform load code from memory?]) AC_DEFINE(TCL_WIDE_CLICKS, 1, diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in index 1328d51..731ed95 100644 --- a/unix/tclConfig.h.in +++ b/unix/tclConfig.h.in @@ -415,9 +415,6 @@ /* Are bytecode statistics enabled? */ #undef TCL_COMPILE_STATS -/* Are we to override what our default encoding is? */ -#undef TCL_DEFAULT_ENCODING - /* Is Tcl built as a framework? */ #undef TCL_FRAMEWORK |