diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-02-24 12:19:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-02-24 12:19:29 (GMT) |
| commit | 912dd9a9979c1abbc38bf25876c315799795b06a (patch) | |
| tree | 55b002e983a52d1fbe5286e2729b35ae38b0e3b6 | |
| parent | 2cce06805f7f8960bc059c1fc206071a2ad1491a (diff) | |
| parent | c7814dd59f9a53ffd76bed082a1e7f55197e75b7 (diff) | |
| download | tcl-912dd9a9979c1abbc38bf25876c315799795b06a.zip tcl-912dd9a9979c1abbc38bf25876c315799795b06a.tar.gz tcl-912dd9a9979c1abbc38bf25876c315799795b06a.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | doc/my.n | 2 | ||||
| -rw-r--r-- | generic/tclClock.c | 2 | ||||
| -rw-r--r-- | generic/tclIO.c | 2 | ||||
| -rw-r--r-- | win/tclWinInt.h | 2 | ||||
| -rw-r--r-- | win/tclWinSock.c | 6 |
5 files changed, 7 insertions, 7 deletions
@@ -23,7 +23,7 @@ package require TclOO The \fBmy\fR command is used to allow methods of objects to invoke methods of the object (or its class), .VS TIP478 -and he \fBmyclass\fR command is used to allow methods of objects to invoke +and the \fBmyclass\fR command is used to allow methods of objects to invoke methods of the current class of the object \fIas an object\fR. .VE TIP478 In particular, the set of valid values for diff --git a/generic/tclClock.c b/generic/tclClock.c index b9df840..e6c9616 100644 --- a/generic/tclClock.c +++ b/generic/tclClock.c @@ -1052,7 +1052,7 @@ ConvertUTCToLocalUsingC( time_t tock; struct tm *timeVal; /* Time after conversion */ int diff; /* Time zone diff local-Greenwich */ - char buffer[8]; /* Buffer for time zone name */ + char buffer[16]; /* Buffer for time zone name */ /* * Use 'localtime' to determine local year, month, day, time of day. diff --git a/generic/tclIO.c b/generic/tclIO.c index 4d5e328..9276c92 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -200,7 +200,7 @@ static int FilterInputBytes(Channel *chanPtr, static int FlushChannel(Tcl_Interp *interp, Channel *chanPtr, int calledFromAsyncFlush); static int TclGetsObjBinary(Tcl_Channel chan, Tcl_Obj *objPtr); -static Tcl_Encoding GetBinaryEncoding(); +static Tcl_Encoding GetBinaryEncoding(void); static void FreeBinaryEncoding(ClientData clientData); static Tcl_HashTable * GetChannelTable(Tcl_Interp *interp); static int GetInput(Channel *chanPtr); diff --git a/win/tclWinInt.h b/win/tclWinInt.h index f019744..841442f 100644 --- a/win/tclWinInt.h +++ b/win/tclWinInt.h @@ -47,7 +47,7 @@ MODULE_SCOPE TclWinProcs tclWinProcs; MODULE_SCOPE char TclWinDriveLetterForVolMountPoint( const WCHAR *mountPoint); -MODULE_SCOPE void TclWinEncodingsCleanup(); +MODULE_SCOPE void TclWinEncodingsCleanup(void); MODULE_SCOPE void TclWinInit(HINSTANCE hInst); MODULE_SCOPE TclFile TclWinMakeFile(HANDLE handle); MODULE_SCOPE Tcl_Channel TclWinOpenConsoleChannel(HANDLE handle, diff --git a/win/tclWinSock.c b/win/tclWinSock.c index efda780..13aaf0b 100644 --- a/win/tclWinSock.c +++ b/win/tclWinSock.c @@ -363,12 +363,12 @@ InitializeHostName( size_t *lengthPtr, Tcl_Encoding *encodingPtr) { - WCHAR wbuf[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD length = MAX_COMPUTERNAME_LENGTH + 1; + WCHAR wbuf[256]; + DWORD length = sizeof(wbuf)/sizeof(WCHAR); Tcl_DString ds; Tcl_DStringInit(&ds); - if (GetComputerNameW(wbuf, &length) != 0) { + if (GetComputerNameExW(ComputerNameDnsFullyQualified, wbuf, &length) != 0) { /* * Convert string from native to UTF then change to lowercase. */ |