diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-01-20 14:36:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-01-20 14:36:36 (GMT) |
| commit | 69868ee129e5fe87ad3e38afa7b92208974af881 (patch) | |
| tree | d324ebcf999d73e37b50ca7b0f1b78aafce2cca4 /generic/tclEncoding.c | |
| parent | 603e23c2a9f36afa883135a76f147807f273e58d (diff) | |
| parent | 7ea11c7f9865dc680b102ea9497fc75634be25e4 (diff) | |
| download | tcl-69868ee129e5fe87ad3e38afa7b92208974af881.zip tcl-69868ee129e5fe87ad3e38afa7b92208974af881.tar.gz tcl-69868ee129e5fe87ad3e38afa7b92208974af881.tar.bz2 | |
merge core-8-branch. Now tested as well with new nmake system.
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index e1e26d3..3d892b7 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -693,6 +693,7 @@ TclFinalizeEncodingSubsystem(void) *------------------------------------------------------------------------- */ +#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 const char * Tcl_GetDefaultEncodingDir(void) { @@ -736,6 +737,7 @@ Tcl_SetDefaultEncodingDir( Tcl_ListObjReplace(NULL, searchPath, 0, 0, 1, &directory); Tcl_SetEncodingSearchPath(searchPath); } +#endif /* *------------------------------------------------------------------------- @@ -3609,7 +3611,7 @@ unilen( static void InitializeEncodingSearchPath( char **valuePtr, - size_t *lengthPtr, + unsigned int *lengthPtr, Tcl_Encoding *encodingPtr) { const char *bytes; |