diff --git a/inc/version.h b/inc/version.h index b4a533a..e73f86c 100755 --- a/inc/version.h +++ b/inc/version.h @@ -255,7 +255,6 @@ typedef signed char s_char; #undef HAS_GETHOSTID #define BSD_COMP 1 #define SYSVSIGNALS 1 -#define WAITINT 1 #define L_SET SEEK_SET #define NOFORN #define LOCK_X_UPDATES 1 @@ -297,7 +296,6 @@ typedef signed char s_char; /* MacOS X, FreeBSD - mostly POSIX-compliant Unix */ #define NOETHER 1 #define XWINDOWS 1 -#define WAITINT 1 #undef REGISTER #define REGISTER diff --git a/src/unixfork.c b/src/unixfork.c index 294b5b4..c38c2db 100644 --- a/src/unixfork.c +++ b/src/unixfork.c @@ -479,47 +479,26 @@ int fork_Unix() { case 'W': /* Wait for a process to die. */ { -#if defined(SYSVONLY) || defined(WAITINT) int status; -#else - union wait status; -#endif /* SYSVONLY */ #ifdef OCR int slot; #endif -#if defined(SYSVONLY) || defined(WAITINT) status = 0; -#else - status.w_status = 0; -#endif /* SYSVONLY */ IOBuf[0] = 0; IOBuf[1] = 0; DBPRINT(("About to wait for processes.\n")); -#ifdef SYSVONLY retry1: pid = waitpid(-1, &status, WNOHANG); if (pid == -1 && errno == EINTR) goto retry1; -#else - pid = wait3(&status, WNOHANG, 0); -#endif /* SYSVONLY */ - if (pid > 0) - - { -/* Ignore processes which are suspended but haven't exited - (this shouldn't happen) */ -#if defined(SYSVONLY) || defined(WAITINT) + if (pid > 0) { + /* Ignore processes which are suspended but haven't exited + (this shouldn't happen) */ if (WIFSTOPPED(status)) break; IOBuf[3] = status >> 8; IOBuf[2] = status & 0xFF; -#else - if (status.w_stopval == WSTOPPED) break; - IOBuf[3] = status.w_T.w_Retcode; - IOBuf[2] = status.w_T.w_Termsig; -#endif /* SYSVONLY */ - IOBuf[1] = pid & 0xFF; IOBuf[0] = (pid >> 8) & 0xFF; } diff --git a/src/uraid.c b/src/uraid.c index 8d6e191..c39cca2 100644 --- a/src/uraid.c +++ b/src/uraid.c @@ -376,12 +376,7 @@ LispPTR uraid_commands() { LispPTR index; DefCell *defcell68k; #ifndef DOS -#if defined(SYSVONLY) || defined(WAITINT) int status; -#else - union wait status; -#endif /* SYSVONLY */ - #endif /* DOS */ if (URaid_argnum == -1) {