diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-01-16 08:40:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-01-16 08:40:47 (GMT) |
| commit | 9a892a33b77f84ab5aa7e0410e6f548cb4331e7c (patch) | |
| tree | 7e902ebb34ebfe5c7a672614fef990f43dbf2081 /unix | |
| parent | ca634be831df519892b22d11f1fa622c1b4241a8 (diff) | |
| parent | 244885a03e8d66f5500058eaf820d6b47f292007 (diff) | |
| download | tcl-9a892a33b77f84ab5aa7e0410e6f548cb4331e7c.zip tcl-9a892a33b77f84ab5aa7e0410e6f548cb4331e7c.tar.gz tcl-9a892a33b77f84ab5aa7e0410e6f548cb4331e7c.tar.bz2 | |
merge core-8-branch
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixInit.c | 6 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index cc66569..630460a 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -577,12 +577,6 @@ TclpSetInitialEncodings(void) Tcl_DStringFree(&encodingName); } -void -TclpSetInterfaces(void) -{ - /* do nothing */ -} - static const char * SearchKnownEncodings( const char *encoding) diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index d464f05..86f1dd0 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -87,8 +87,8 @@ typedef off_t Tcl_SeekOffset; typedef unsigned short WCHAR; __declspec(dllimport) extern __stdcall int GetModuleHandleExW(unsigned int, const char *, void *); __declspec(dllimport) extern __stdcall int GetModuleFileNameW(void *, const char *, int); - __declspec(dllimport) extern __stdcall int WideCharToMultiByte(int, int, const char *, int, - const char *, int, const char *, const char *); + __declspec(dllimport) extern __stdcall int WideCharToMultiByte(int, int, const void *, int, + char *, int, const char *, void *); __declspec(dllimport) extern __stdcall int MultiByteToWideChar(int, int, const char *, int, WCHAR *, int); __declspec(dllimport) extern __stdcall void OutputDebugStringW(const WCHAR *); |