Module Name: src
Committed By: sjg
Date: Wed May 5 07:05:33 UTC 2010
Modified Files:
src/usr.bin/make: util.c
Log Message:
gcc defines __svr4__
SunPro compiler defines __SVR4
We need to check both to ensure that on SunOS signal is hooked into
sigaction - otherwise we do not pass the unit-tests due to missing
a SIGCHLD
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/make/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/util.c
diff -u src/usr.bin/make/util.c:1.48 src/usr.bin/make/util.c:1.49
--- src/usr.bin/make/util.c:1.48 Thu Jan 29 09:03:04 2009
+++ src/usr.bin/make/util.c Wed May 5 07:05:33 2010
@@ -1,15 +1,15 @@
-/* $NetBSD: util.c,v 1.48 2009/01/29 09:03:04 dholland Exp $ */
+/* $NetBSD: util.c,v 1.49 2010/05/05 07:05:33 sjg Exp $ */
/*
* Missing stuff from OS's
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: util.c,v 1.48 2009/01/29 09:03:04 dholland Exp $";
+static char rcsid[] = "$NetBSD: util.c,v 1.49 2010/05/05 07:05:33 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: util.c,v 1.48 2009/01/29 09:03:04 dholland Exp $");
+__RCSID("$NetBSD: util.c,v 1.49 2010/05/05 07:05:33 sjg Exp $");
#endif
#endif
@@ -370,7 +370,7 @@
} /* end getwd */
#endif /* __hpux */
-#if defined(sun) && defined(__svr4__)
+#if defined(sun) && (defined(__svr4__) || defined(__SVR4))
#include <signal.h>
/* turn into bsd signals */
