From b4042860b8eedc150e5a361f809143d4bb77fa34 Mon Sep 17 00:00:00 2001 From: ram <ram> Date: Wed, 26 Oct 1994 21:55:54 +0000 Subject: [PATCH] SVR4/solaris changes. --- motif/server/datatrans.c | 4 ++++ motif/server/main.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/motif/server/datatrans.c b/motif/server/datatrans.c index ee49251af..d6faa9d65 100644 --- a/motif/server/datatrans.c +++ b/motif/server/datatrans.c @@ -4,6 +4,10 @@ #include <X11/StringDefs.h> #include <Xm/Xm.h> +#ifdef SVR4 +#define bzero(a,n) memset(a, 0, n) +#endif + #include "global.h" #include "types.h" #include "datatrans.h" diff --git a/motif/server/main.c b/motif/server/main.c index 4ac300dda..cf33a3d23 100644 --- a/motif/server/main.c +++ b/motif/server/main.c @@ -11,12 +11,18 @@ #include <sys/wait.h> +#ifdef SVR4 +#define bzero(a,n) memset(a, 0, n) +#endif + #define PORT 8000 #define MAX(x,y) ((x<y)?y:x) /* Some things (ie. RT) don't define this in errno.h. Go figure. */ +#ifndef SVR4 extern int errno; +#endif extern void serve_client(int socket); @@ -145,7 +151,11 @@ main(int argc, char **argv) fd_set rfds; int nfound,nfds,i; int port = PORT; +#ifdef SVR4 + int status; +#else union wait status; +#endif /* This is so resources can be passed to the servers on the command line */ global_argc = argc; @@ -230,6 +240,10 @@ main(int argc, char **argv) establish_client(inet_socket); } /* Prevent zombie children under Mach */ +#ifdef SVR4 + waitpid(-1, &status, WNOHANG); +#else wait3(&status,WNOHANG,NULL); +#endif } } -- GitLab