* 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
{
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);
}
{
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);
}
/* 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);
}
}
{
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
FreeLibrary(hModule);
}
#else
- fatal(NILF, szMessageBuffer);
+ O (fatal, NILF, szMessageBuffer);
#endif
} else {
/*