diff options
| -rw-r--r-- | job.c | 4 | ||||
| -rw-r--r-- | main.c | 4 | ||||
| -rw-r--r-- | w32/subproc/w32err.c | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -1012,7 +1012,7 @@ free_child (struct child *child) { DWORD err = GetLastError (); const char *estr = map_windows32_error_to_string (err); - OSN (fatal, NILF, + ONS (fatal, NILF, _("release jobserver semaphore: (Error %ld: %s)"), err, estr); } @@ -1959,7 +1959,7 @@ new_job (struct file *file) { DWORD err = GetLastError (); const char *estr = map_windows32_error_to_string (err); - OSN (fatal, NILF, + ONS (fatal, NILF, _("semaphore or child process wait: (Error %ld: %s)"), err, estr); } @@ -793,7 +793,7 @@ prepare_mutex_handle_string (sync_handle_t handle) /* Prepare the mutex handle string for our children. */ /* 2 hex digits per byte + 2 characters for "0x" + null. */ 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); } } @@ -1981,7 +1981,7 @@ main (int argc, char **argv, char **envp) { DWORD err = GetLastError (); const char *estr = map_windows32_error_to_string (err); - OSN (fatal, NILF, + ONS (fatal, NILF, _("creating jobserver semaphore: (Error %ld: %s)"), err, estr); } #else diff --git a/w32/subproc/w32err.c b/w32/subproc/w32err.c index facfabc..9b0866a 100644 --- a/w32/subproc/w32err.c +++ b/w32/subproc/w32err.c @@ -67,7 +67,7 @@ map_windows32_error_to_string (DWORD ercode) { FreeLibrary(hModule); } #else - fatal(NILF, szMessageBuffer); + O (fatal, NILF, szMessageBuffer); #endif } else { /* |