diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-08-27 12:40:40 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-08-27 12:40:40 (GMT) |
| commit | ecd5a8ed960d4cb3a9b0c87b4452037f72e395a9 (patch) | |
| tree | 39b75f2805620ade4b1fc3b5513023111b1107ea | |
| parent | e6bb8f361290d568722685292e0aca56a53a6ad9 (diff) | |
| parent | b71431513bf64dcf7aeb53bd0788714c55171e90 (diff) | |
| download | tcl-ecd5a8ed960d4cb3a9b0c87b4452037f72e395a9.zip tcl-ecd5a8ed960d4cb3a9b0c87b4452037f72e395a9.tar.gz tcl-ecd5a8ed960d4cb3a9b0c87b4452037f72e395a9.tar.bz2 | |
merge trunk
| -rw-r--r-- | ChangeLog | 27 | ||||
| -rw-r--r-- | generic/tclIntPlatDecls.h | 5 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 9 | ||||
| -rwxr-xr-x | library/msgs/uk.msg | 2 |
4 files changed, 29 insertions, 14 deletions
@@ -1,11 +1,16 @@ +2012-08-25 Donal K. Fellows <dkf@users.sf.net> + + * library/msgs/uk.msg: [Bug 3561330]: Use the correct full name of + March in Ukrainian. Thanks to Mikhail Teterin for reporting. + 2012-08-23 Jan Nijtmans <nijtmans@users.sf.net> - * generic/tclBinary.c: [Bug 3496014] Unecessary memset() in + * generic/tclBinary.c: [Bug 3496014]: Unecessary memset() in Tcl_SetByteArrayObj(). 2012-08-20 Don Porter <dgp@users.sourceforge.net> - * generic/tclPathObj.c: [Bug 3559678] Fix bad filename normalization + * generic/tclPathObj.c: [Bug 3559678]: Fix bad filename normalization when the last component is the empty string. 2012-08-20 Jan Nijtmans <nijtmans@users.sf.net> @@ -28,8 +33,8 @@ 2010-08-13 Stuart Cassoff <stwo@users.sourceforge.net> - * unix/tclUnixCompat.c: [Bug 3555454] Rearrange a bit - to quash 'declared but never defined' compiler warnings. + * unix/tclUnixCompat.c: [Bug 3555454]: Rearrange a bit to quash + 'declared but never defined' compiler warnings. 2012-08-13 Jan Nijtmans <nijtmans@users.sf.net> @@ -55,8 +60,8 @@ 2012-08-07 Don Porter <dgp@users.sourceforge.net> - * generic/tclIOUtil.c: [Bug 3554250] Overlooked one field of - cleanup in the thread exit handler for the filesystem subsystem. + * generic/tclIOUtil.c: [Bug 3554250]: Overlooked one field of cleanup + in the thread exit handler for the filesystem subsystem. 2012-07-31 Donal K. Fellows <dkf@users.sf.net> @@ -245,9 +250,9 @@ 2012-06-11 Don Porter <dgp@users.sourceforge.net> * generic/tclBasic.c: [Bug 3532959]: Make sure the lifetime - * generic/tclProc.c: management of entries in the linePBodyPtr hash - * tests/proc.test: table can tolerate either order of teardown, - interp first, or Proc first. + * generic/tclProc.c: management of entries in the linePBodyPtr + * tests/proc.test: hash table can tolerate either order of + teardown, interp first, or Proc first. 2012-06-08 Don Porter <dgp@users.sourceforge.net> @@ -593,8 +598,8 @@ 2012-04-04 Jan Nijtmans <nijtmans@users.sf.net> - * win/tclWinSock.c: [Bug 510001]: TclSockMinimumBuffers needs plat imp - * generic/tclIOSock.c: + * win/tclWinSock.c: [Bug 510001]: TclSockMinimumBuffers needs + * generic/tclIOSock.c: platform implementation. * generic/tclInt.decls: * generic/tclIntDecls.h: * generic/tclStubInit.c: diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 7322a37..36cb918 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -525,7 +525,10 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr; #undef TclWinConvertWSAError #define TclWinConvertWSAError TclWinConvertError -#if !defined(__WIN32__) && !defined(__CYGWIN__) +#if defined(__WIN32__) || defined(__CYGWIN__) +# undef TclWinNToHS +# define TclWinNToHS ntohs +#else # undef TclpGetPid # define TclpGetPid(pid) ((unsigned long) (pid)) #endif diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 7eb1788..0fc35d5 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -53,7 +53,14 @@ static int TclSockMinimumBuffersOld(int sock, int size) } #endif -#define TclWinNToHS ntohs + +#if defined(_WIN32) || defined(__CYGWIN__) +#undef TclWinNToHS +#define TclWinNToHS winNToHS +static unsigned short TclWinNToHS(unsigned short ns) { + return ntohs(ns); +} +#endif #ifdef __WIN32__ # define TclUnixWaitForFile 0 diff --git a/library/msgs/uk.msg b/library/msgs/uk.msg index 3e24f86..7d4c64a 100755 --- a/library/msgs/uk.msg +++ b/library/msgs/uk.msg @@ -33,7 +33,7 @@ namespace eval ::tcl::clock { ::msgcat::mcset uk MONTHS_FULL [list \ "\u0441\u0456\u0447\u043d\u044f"\ "\u043b\u044e\u0442\u043e\u0433\u043e"\ - "\u0431\u0435\u0440\u0435\u0436\u043d\u044f"\ + "\u0431\u0435\u0440\u0435\u0437\u043d\u044f"\ "\u043a\u0432\u0456\u0442\u043d\u044f"\ "\u0442\u0440\u0430\u0432\u043d\u044f"\ "\u0447\u0435\u0440\u0432\u043d\u044f"\ |