Skip to content

Commit 521827e

Browse files
author
jan.nijtmans
committed
Update nmakehlp.c
1 parent d5dcc4f commit 521827e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

win/nmakehlp.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ CheckForCompilerFeature(
271271
if (!ok) {
272272
DWORD err = GetLastError();
273273
int chars = snprintf(msg, sizeof(msg) - 1,
274-
"Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
274+
"Tried to launch: \"%s\", but got error [%lu]: ", cmdline, err);
275275

276276
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
277277
FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
@@ -405,12 +405,12 @@ CheckForLinkerFeature(
405405
if (!ok) {
406406
DWORD err = GetLastError();
407407
int chars = snprintf(msg, sizeof(msg) - 1,
408-
"Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
408+
"Tried to launch: \"%s\", but got error [%lu]: ", cmdline, err);
409409

410410
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
411411
FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
412412
(300-chars), 0);
413-
WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL);
413+
WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err, NULL);
414414
return 2;
415415
}
416416

@@ -797,7 +797,7 @@ static int LocateDependency(const char *keypath)
797797
{
798798
size_t i;
799799
int ret;
800-
static const char *paths[] = {"..", "..\\..", "..\\..\\.."};
800+
static const char *const paths[] = {"..", "..\\..", "..\\..\\.."};
801801

802802
for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {
803803
ret = LocateDependencyHelper(paths[i], keypath);

0 commit comments

Comments
 (0)