diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-05-16 10:26:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-05-16 10:26:48 (GMT) |
| commit | 32ffe00c487430f5e2d999d7cacf65a0a2046578 (patch) | |
| tree | 9ca6f19c81b93b005733dffed7f3692df03b2a10 | |
| parent | 4eb91b8e5b59d6af6a2d612f6767f2f62d0cddd2 (diff) | |
| parent | 8f8a3bc1c00622bd15dd1a9d1dd06a906ed64f4e (diff) | |
| download | tcl-32ffe00c487430f5e2d999d7cacf65a0a2046578.zip tcl-32ffe00c487430f5e2d999d7cacf65a0a2046578.tar.gz tcl-32ffe00c487430f5e2d999d7cacf65a0a2046578.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | win/nmakehlp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/win/nmakehlp.c b/win/nmakehlp.c index e0941e3..86dfc11 100644 --- a/win/nmakehlp.c +++ b/win/nmakehlp.c @@ -4,8 +4,8 @@ * * This is used to fix limitations within nmake and the environment. * - * Copyright (c) 2002 by David Gravereaux. - * Copyright (c) 2006 by Pat Thoyts + * Copyright (c) 2002 David Gravereaux. + * Copyright (c) 2006 Pat Thoyts * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. @@ -22,7 +22,7 @@ #include <math.h> /* ISO hack for dumb VC++ */ -#ifdef _MSC_VER +#if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf #endif @@ -198,13 +198,13 @@ CheckForCompilerFeature( hProcess = GetCurrentProcess(); - ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); - ZeroMemory(&si, sizeof(STARTUPINFO)); + memset(&pi, 0, sizeof(PROCESS_INFORMATION)); + memset(&si, 0, sizeof(STARTUPINFO)); si.cb = sizeof(STARTUPINFO); si.dwFlags = STARTF_USESTDHANDLES; si.hStdInput = INVALID_HANDLE_VALUE; - ZeroMemory(&sa, sizeof(SECURITY_ATTRIBUTES)); + memset(&sa, 0, sizeof(SECURITY_ATTRIBUTES)); sa.nLength = sizeof(SECURITY_ATTRIBUTES); sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = FALSE; @@ -334,13 +334,13 @@ CheckForLinkerFeature( hProcess = GetCurrentProcess(); - ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); - ZeroMemory(&si, sizeof(STARTUPINFO)); + memset(&pi, 0, sizeof(PROCESS_INFORMATION)); + memset(&si, 0, sizeof(STARTUPINFO)); si.cb = sizeof(STARTUPINFO); si.dwFlags = STARTF_USESTDHANDLES; si.hStdInput = INVALID_HANDLE_VALUE; - ZeroMemory(&sa, sizeof(SECURITY_ATTRIBUTES)); + memset(&sa, 0, sizeof(SECURITY_ATTRIBUTES)); sa.nLength = sizeof(SECURITY_ATTRIBUTES); sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = TRUE; |