31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
Index: vrpn-version_07.33/vrpn_Connection.C
|
|
===================================================================
|
|
--- vrpn-version_07.33.orig/vrpn_Connection.C
|
|
+++ vrpn-version_07.33/vrpn_Connection.C
|
|
@@ -2486,11 +2486,7 @@ static int vrpn_start_server(const char
|
|
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);
|
|
@@ -2504,13 +2500,7 @@ static int vrpn_start_server(const char
|
|
}
|
|
|
|
/* 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
|
|
if (deadkid == pid) {
|
|
fprintf(stderr, "vrpn_start_server: server process exited\n");
|
|
vrpn_closeSocket(server_sock);
|