summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-10-20 08:26:08 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-10-20 08:26:08 (GMT)
commit08b52360819dd3715e139eb3bcc0faae57e3a33c (patch)
tree15ebd2c80dda37ed4bc92482ad069e070c4107b5
parent9d3abb8846c9436ab40ac8ed9ecbaa9195f6e1f2 (diff)
parentc28fb81c1299e87584ea2ecd22107f3649d6d20b (diff)
downloadtcl-08b52360819dd3715e139eb3bcc0faae57e3a33c.zip
tcl-08b52360819dd3715e139eb3bcc0faae57e3a33c.tar.gz
tcl-08b52360819dd3715e139eb3bcc0faae57e3a33c.tar.bz2
Merge 8.6
-rw-r--r--win/nmakehlp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index c8b39a7..b0799f8 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -19,7 +19,6 @@
#pragma comment (lib, "kernel32.lib")
#endif
#include <stdio.h>
-#include <math.h>
/*
* This library is required for x64 builds with _some_ versions of MSVC
@@ -272,7 +271,7 @@ CheckForCompilerFeature(
if (!ok) {
DWORD err = GetLastError();
int chars = snprintf(msg, sizeof(msg) - 1,
- "Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
+ "Tried to launch: \"%s\", but got error [%lu]: ", cmdline, err);
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
@@ -406,7 +405,7 @@ CheckForLinkerFeature(
if (!ok) {
DWORD err = GetLastError();
int chars = snprintf(msg, sizeof(msg) - 1,
- "Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
+ "Tried to launch: \"%s\", but got error [%lu]: ", cmdline, err);
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],