Solve some Windows build issues.

* 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

1 files changed, 2 insertions, 2 deletions

diff --git a/job.c b/job.c
index 2b17f42..d3d63b8 100644
--- a/job.c
+++ b/job.c
@@ -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);
           }