summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2011-11-15 21:12:53 +0000
committerPaul Smith <psmith@gnu.org>2011-11-15 21:12:53 +0000
commitdc2a6ceb81730c25c0beec1f13994b9710767ee1 (patch)
treed8ffe41c5bb5af3a5544af0a8a0bdfc36eb2fd01 /main.c
parent4f47fbf953faae5d38bdc4e709aa8872e3914418 (diff)
downloadgunmake-dc2a6ceb81730c25c0beec1f13994b9710767ee1.tar.gz
Enable jobserver on W32 when using configure.
Some W32 cleanups: see Savannah bug #34830 Forgot to modify the config.h.W32.template file for jobserver support.
Diffstat (limited to 'main.c')
-rw-r--r--main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/main.c b/main.c
index 16957d4..86a89ad 100644
--- a/main.c
+++ b/main.c
@@ -36,6 +36,7 @@ this program. If not, see <http://www.gnu.org/licenses/>. */
# include <io.h>
# include "pathstuff.h"
# include "sub_proc.h"
+# include "w32err.h"
#endif
#ifdef __EMX__
# include <sys/types.h>
@@ -988,7 +989,7 @@ main (int argc, char **argv, char **envp)
fatal_signal_mask = 0;
#define ADD_SIG(sig) fatal_signal_mask |= sigmask (sig)
#else
-#define ADD_SIG(sig) (void)sig /* Needed to avoid warnings in MSVC. */
+#define ADD_SIG(sig) (void)sig
#endif
#endif
@@ -1728,7 +1729,7 @@ main (int argc, char **argv, char **envp)
if (! open_jobserver_semaphore(cp))
{
DWORD err = GetLastError();
- fatal (NILF,_("internal error: unable to open jobserver semaphore `%s': (Error %d: %s)"),
+ fatal (NILF, _("internal error: unable to open jobserver semaphore `%s': (Error %ld: %s)"),
cp, err, map_windows32_error_to_string(err));
}
DB (DB_JOBS, (_("Jobserver client (semaphore %s)\n"), cp));
@@ -1804,7 +1805,7 @@ main (int argc, char **argv, char **envp)
if (! create_jobserver_semaphore(job_slots - 1))
{
DWORD err = GetLastError();
- fatal (NILF,_("creating jobserver semaphore: (Error %d: %s)"),
+ fatal (NILF, _("creating jobserver semaphore: (Error %ld: %s)"),
err, map_windows32_error_to_string(err));
}
#else