Fix build on current.

Submitted by:	mike
This commit is contained in:
Kris Kennaway
2002-06-16 09:18:43 +00:00
parent 6dcd5edfb9
commit e40b1bb942
7 changed files with 102 additions and 0 deletions

View File

@@ -0,0 +1,11 @@
--- src/frontend/aspice.c Tue Jun 4 21:18:04 2002
+++ src/frontend/aspice.c Tue Jun 4 21:17:32 2002
@@ -178,6 +178,8 @@
#if defined(__NetBSD__)
pid_t status;
+#elif defined(__FreeBSD__)
+ int status;
#else
union wait status;
#endif

View File

@@ -0,0 +1,20 @@
--- main.c.orig Tue Jun 4 21:56:28 2002
+++ main.c Tue Jun 4 21:59:33 2002
@@ -264,7 +264,7 @@
static SIGNAL_T
finish()
{
-#if defined(SYSV) || defined(POSIX)
+#if defined(BSD) || defined(SYSV) || defined(POSIX)
int status;
#else
union wait status;
@@ -272,7 +272,7 @@
register int pid;
register int die = 0;
-#if defined(SYSV) || defined(POSIX)
+#if defined(BSD) || defined(SYSV) || defined(POSIX)
while ((pid = waitpid(-1, &status, WNOHANG|WUNTRACED)) > 0)
#else
while ((pid = wait3(&status, WNOHANG|WUNTRACED, (struct rusage *)0))>0)

View File

@@ -0,0 +1,14 @@
--- unix/config.h.orig Tue Jun 4 21:35:28 2002
+++ unix/config.h Tue Jun 4 21:34:59 2002
@@ -208,6 +208,11 @@
# define HAVE_POSIX
#endif /* SYSV */
+#include <sys/param.h>
+#ifdef __FreeBSD__
+# define HAVE_POSIX
+#endif
+
#define LIBTOC "__.SYMDEF"
#define LIBFLAG "-l"
#define LIBPREFIX "lib"

View File

@@ -0,0 +1,14 @@
--- ttyrec.c.orig Tue Jun 4 21:52:00 2002
+++ ttyrec.c Tue Jun 4 21:52:12 2002
@@ -202,11 +202,7 @@
void
finish()
{
-#if defined(SVR4)
int status;
-#else /* !SVR4 */
- union wait status;
-#endif /* !SVR4 */
register int pid;
register int die = 0;

View File

@@ -0,0 +1,21 @@
--- server.c Tue Jun 4 21:40:19 2002
+++ server.c Tue Jun 4 21:42:56 2002
@@ -146,7 +146,7 @@
{
int child, pid, fd;
unsigned int retval = 0;
-#if defined(HPUX) || defined(SVR4)
+#if defined(HPUX) || defined(SVR4) || defined(BSD)
int status;
#else
union wait status;
@@ -202,6 +202,9 @@
#if defined(HPUX) || defined(SVR4)
if (status & 0xff) retval = -1;
else retval = ((status & 0xffff) >> 8);
+#elif defined(BSD)
+ if (WIFSIGNALED(status)) retval = -1;
+ else retval = WEXITSTATUS(status);
#else
if (status.w_termsig) retval = -1; /* ended in signal */
else retval = status.w_retcode;

View File

@@ -0,0 +1,11 @@
--- server/netaux.c.orig Tue Jun 4 21:22:30 2002
+++ server/netaux.c Tue Jun 4 21:23:10 2002
@@ -261,7 +261,7 @@
reaper()
{
-#ifndef USG
+#if !defined(USG) && !defined(BSD_44)
union wait status;
while (wait3(&status, WNOHANG, (struct rusage *)0) > 0)

View File

@@ -0,0 +1,11 @@
--- nntpbtr.c Tue Jun 4 21:26:27 2002
+++ nntpbtr.c Tue Jun 4 21:26:47 2002
@@ -95,7 +95,7 @@
qchld()
{
int pid;
- union wait status;
+ int status;
while( (pid = wait3(&status, WNOHANG, (struct rusage *)0)) > 0 ) ;
}