diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2005-11-03 00:17:30 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2005-11-03 00:17:30 (GMT) |
| commit | 2ac3a08a98a293de62ed6ae01aa7a7d139660207 (patch) | |
| tree | 86fab92b7dc7b1f3c9f8d9b9a0ead95a215fd1cd /win/nmakehlp.c | |
| parent | 4299352915cf05025553108f48b7bf58f48a8353 (diff) | |
| download | tcl-2ac3a08a98a293de62ed6ae01aa7a7d139660207.zip tcl-2ac3a08a98a293de62ed6ae01aa7a7d139660207.tar.gz tcl-2ac3a08a98a293de62ed6ae01aa7a7d139660207.tar.bz2 | |
Applied patch #1096916 to support building with MSVC 8.
* generic/regerror.c: Avoid use of reserved word.
* generic/tcl.h: Select the right Tcl_Stat structure
* generic/tclDate.c: Casts to handle 64 bit time_t case.
* tests/env.test: Include essential envvar on Win32
* win/nmakehlp.c: Handle new return codes.
* win/makefile.vc: Use the selected options.
* win/rules.vc: Check options are applicable
* win/tclWinPort.h: Disable deprecated function warnings
* win/tclWinSock.c: Provide default value to avoid warning.
* win/tclWinTime.c: Add casts to handle 64bit time_t type.
Diffstat (limited to 'win/nmakehlp.c')
| -rw-r--r-- | win/nmakehlp.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/win/nmakehlp.c b/win/nmakehlp.c index 4599315..d1fb6b4 100644 --- a/win/nmakehlp.c +++ b/win/nmakehlp.c @@ -9,7 +9,7 @@ * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * * ---------------------------------------------------------------------------- - * RCS: @(#) $Id: nmakehlp.c,v 1.7 2004/02/10 22:04:04 davygrvy Exp $ + * RCS: @(#) $Id: nmakehlp.c,v 1.8 2005/11/03 00:17:31 patthoyts Exp $ * ---------------------------------------------------------------------------- */ #include <windows.h> @@ -192,8 +192,13 @@ CheckForCompilerFeature (const char *option) CloseHandle(pipeThreads[0]); CloseHandle(pipeThreads[1]); - /* look for the commandline warning code in both streams. */ - return !(strstr(Out.buffer, "D4002") != NULL || strstr(Err.buffer, "D4002") != NULL); + /* look for the commandline warning code in both streams. + * - in MSVC 6 & 7 we get D4002, in MSVC 8 we get D9002. + */ + return !(strstr(Out.buffer, "D4002") != NULL + || strstr(Err.buffer, "D4002") != NULL + || strstr(Out.buffer, "D9002") != NULL + || strstr(Err.buffer, "D9002") != NULL); } int |