github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2024-12-30 23:10:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Solve some Windows build issues.

Browse Source 
* main.c (main): Use ONS(), not OSN().
(prepare_mutex_handle_string) [WINDOWS32]: Use %Ix formatting to
support both 32bit and 64bit systems.
* job.c (free_child, new_job): Use ONS(), not OSN().
* w32/subproc/w32err.c (map_windws32_error_to_string): Use O() when
calling fatal().

Copyright-paperwork-exempt: yes
This commit is contained in:
Stephan T. Lavavej 2013-11-27 10:57:01 -05:00 committed by Paul Smith
parent f5f5adb62c
commit 99385ee6f7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
job.c
View File

@ -1012,7 +1012,7 @@ free_child (struct child *child)
{ {
DWORD err = GetLastError (); DWORD err = GetLastError ();
const char *estr = map_windows32_error_to_string (err); const char *estr = map_windows32_error_to_string (err);
OSN (fatal, NILF, ONS (fatal, NILF,
_("release jobserver semaphore: (Error %ld: %s)"), err, estr); _("release jobserver semaphore: (Error %ld: %s)"), err, estr);
} }
@ -1959,7 +1959,7 @@ new_job (struct file *file)
{ {
DWORD err = GetLastError (); DWORD err = GetLastError ();
const char *estr = map_windows32_error_to_string (err); const char *estr = map_windows32_error_to_string (err);
OSN (fatal, NILF, ONS (fatal, NILF,
_("semaphore or child process wait: (Error %ld: %s)"), _("semaphore or child process wait: (Error %ld: %s)"),
err, estr); err, estr);
} }

4
main.c
View File

@ -793,7 +793,7 @@ prepare_mutex_handle_string (sync_handle_t handle)
/* Prepare the mutex handle string for our children. */ /* Prepare the mutex handle string for our children. */
/* 2 hex digits per byte + 2 characters for "0x" + null. */ /* 2 hex digits per byte + 2 characters for "0x" + null. */
sync_mutex = xmalloc ((2 * sizeof (sync_handle_t)) + 2 + 1); sync_mutex = xmalloc ((2 * sizeof (sync_handle_t)) + 2 + 1);
sprintf (sync_mutex, "0x%x", handle); sprintf (sync_mutex, "0x%Ix", handle);
define_makeflags (1, 0); define_makeflags (1, 0);
} }
} }
@ -1981,7 +1981,7 @@ main (int argc, char **argv, char **envp)
{ {
DWORD err = GetLastError (); DWORD err = GetLastError ();
const char *estr = map_windows32_error_to_string (err); const char *estr = map_windows32_error_to_string (err);
OSN (fatal, NILF, ONS (fatal, NILF,
_("creating jobserver semaphore: (Error %ld: %s)"), err, estr); _("creating jobserver semaphore: (Error %ld: %s)"), err, estr);
} }
#else #else

2
w32/subproc/w32err.c
View File

@ -67,7 +67,7 @@ map_windows32_error_to_string (DWORD ercode) {
FreeLibrary(hModule); FreeLibrary(hModule);
} }
#else #else
fatal(NILF, szMessageBuffer); O (fatal, NILF, szMessageBuffer);
#endif #endif
} else { } else {
/* /*