File switch-to-waitpid-from-wait3.patch of Package vrpn

Overview Repositories Revisions Requests Users Attributes Meta

File switch-to-waitpid-from-wait3.patch of Package vrpn (Revision 99d49840498b8ecf33c887c1c3238e92)

Currently displaying revision 99d49840498b8ecf33c887c1c3238e92 , Show latest

diff -Nur vrpn-07.33/vrpn_Connection.C new/vrpn_Connection.C
--- vrpn-07.33/vrpn_Connection.C	2015-01-17 17:16:12.000000000 +0100
+++ new/vrpn_Connection.C	2017-08-05 14:36:23.933269221 +0200
@@ -59,7 +59,7 @@
 #endif
 
 #ifndef VRPN_USE_WINSOCK_SOCKETS
-#include <sys/wait.h> // for wait, wait3, WNOHANG
+#include <sys/wait.h> // for waitpid, WNOHANG
 #ifndef __CYGWIN__
 #include <netinet/tcp.h> // for TCP_NODELAY
 #endif                   /* __CYGWIN__ */
@@ -189,22 +189,6 @@
 
 const char *vrpn_CONTROL = "VRPN Control";
 
-//**********************************************************************
-//**  This section has been pulled from the "SDI" library and had its
-//**  functions renamed to vrpn_ from sdi_.  This removes our dependence
-//**  on libsdi.a for VRPN.
-
-#ifdef sparc
-
-// On capefear and swift, getdtablesize() isn't declared in unistd.h
-// even though the man page says it should be.  Similarly, wait3()
-// isn't declared in sys/{wait,time,resource}.h.
-extern "C" {
-extern int getdtablesize(void);
-pid_t wait3(int *statusp, int options, struct rusage *rusage);
-}
-#endif
-
 /* On HP's, this defines how many possible open file descriptors can be
  * open at once.  This is what is returned by the getdtablesize() function
  * on other architectures. */
@@ -2408,7 +2392,7 @@
 {
 #if defined(VRPN_USE_WINSOCK_SOCKETS) || defined(__CYGWIN__)
     fprintf(stderr, "VRPN: vrpn_start_server not ported"
-                    " for windows winsocks or cygwin!\n");
+                    " for windows winsock or cygwin!\n");
     IPaddress = IPaddress;
     args = args;
     server_name = server_name;
@@ -2486,11 +2470,7 @@
         for (waitloop = 0; waitloop < (SERVCOUNT); waitloop++) {
             int ret;
             pid_t deadkid;
-#if defined(sparc) || defined(FreeBSD) || defined(_AIX) || defined(__ANDROID__)
-            int status; // doesn't exist on sparc_solaris or FreeBSD
-#else
-            union wait status;
-#endif
+            int status;
 
             /* Check to see if they called back yet. */
             ret = vrpn_poll_for_accept(server_sock, &child_socket, SERVWAIT);
@@ -2503,14 +2483,8 @@
                 break; // Got it!
             }
 
-/* Check to see if the child is dead yet */
-#if defined(hpux) || defined(sgi) || defined(__hpux) || defined(__CYGWIN__) || \
-    defined(__APPLE__)
-            /* hpux include files have the wrong declaration */
-            deadkid = wait3((int *)&status, WNOHANG, NULL);
-#else
-            deadkid = wait3(&status, WNOHANG, NULL);
-#endif
+            /* Check to see if the child is dead yet */
+            deadkid = waitpid(-1, &status, WNOHANG);
             if (deadkid == pid) {
                 fprintf(stderr, "vrpn_start_server: server process exited\n");
                 vrpn_closeSocket(server_sock);

Places

File switch-to-waitpid-from-wait3.patch of Package vrpn (Revision 99d49840498b8ecf33c887c1c3238e92)

Places