diff options
| author | hobbs <hobbs> | 2001-10-15 17:39:34 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2001-10-15 17:39:34 (GMT) |
| commit | e12ed46cbc4a6c5877e4340170cb1dfc25f00ce1 (patch) | |
| tree | 6b14c93a18e057d4802f6f5025e3db6c322cc885 | |
| parent | e264ffe6d8bcec38655e1ac3987bcdc4b8bcd65f (diff) | |
| download | tcl-e12ed46cbc4a6c5877e4340170cb1dfc25f00ce1.zip tcl-e12ed46cbc4a6c5877e4340170cb1dfc25f00ce1.tar.gz tcl-e12ed46cbc4a6c5877e4340170cb1dfc25f00ce1.tar.bz2 | |
* generic/tcl.h:
* win/tclWinPort.h: moved #define of WIN32 to tcl.h where __WIN32__
is defined and added #ifndef check.
| -rw-r--r-- | ChangeLog | 30 | ||||
| -rw-r--r-- | generic/tcl.h | 8 | ||||
| -rw-r--r-- | win/tclWinPort.h | 4 |
3 files changed, 38 insertions, 4 deletions
@@ -1,3 +1,33 @@ +2001-10-15 Jeff Hobbs <jeffh@ActiveState.com> + + * generic/tcl.h: + * win/tclWinPort.h: moved #define of WIN32 to tcl.h where __WIN32__ + is defined and added #ifndef check. + +2001-10-12 Jeff Hobbs <jeffh@ActiveState.com> + + * tests/winPipe.test: removed obsolete cat16 tests, fixed + winpipe-1.22 to only run on Win9*. + + * tests/timer.test: slight skewing of after values to allow for + correct results on burdened machines. + + * tests/winFCmd.test: differentiated test results for win2k + versus not. + + * win/tclWinInit.c: cleanup back-ported from 8.4 HEAD. + + * win/tclWinPort.h: move winsock2.h include, header cleanup + back-ported from 8.4 HEAD. + + * library/encoding/ebcdic.enc: + * tools/encoding/ebcdic.txt: EBCDIC charset mapping. + [Patch #219323] (nijtmans) + + * library/encoding/tis-620.enc: + * tools/encoding/tis-620.txt: TIS-620 charset mapping. + [Patch #467423] (poonlap) + 2001-10-11 Miguel Sofer <msofer@users.sourceforge.net> * generic/tclLiteral.c: (TclReleaseLiteral) insured that diff --git a/generic/tcl.h b/generic/tcl.h index 9dd7532..977f5b4 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tcl.h,v 1.70.2.7 2001/10/03 20:26:09 hobbs Exp $ + * RCS: @(#) $Id: tcl.h,v 1.70.2.8 2001/10/15 17:39:34 hobbs Exp $ */ #ifndef _TCL @@ -70,8 +70,12 @@ extern "C" { */ #ifndef __WIN32__ -# if defined(_WIN32) || defined(WIN32) +# if defined(_WIN32) || defined(WIN32) || \ + defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__) # define __WIN32__ +# ifndef WIN32 +# define WIN32 +# endif # endif #endif diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 5271a10..4b9581d 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinPort.h,v 1.12.2.4 2001/10/13 01:10:03 hobbs Exp $ + * RCS: @(#) $Id: tclWinPort.h,v 1.12.2.5 2001/10/15 17:39:34 hobbs Exp $ */ #ifndef _TCLWINPORT @@ -68,7 +68,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #undef WIN32_LEAN_AND_MEAN -#define WIN32 + #include <winsock2.h> #ifdef BUILD_tcl |