Have just one conditional to include unistd.h.

Test NEED_UNISTD_H, not AIX and IRIX4.
(UNISTD_H_INCLUDED): Don't define or test this.

diff --git a/src/systty.h b/src/systty.h
index b74215b84c16a302e4b267cbe3234d75388d7461..7bc1da206b32f53121dce372cb771d00c424dc7a 100644 (file)
--- a/src/systty.h
+++ b/src/systty.h
@@ -138,22 +138,13 @@ static struct sensemode {
 #if defined (HPUX) && defined (HAVE_PTYS)
 #include <sys/ptyio.h>
 #endif
-  
+
 #ifdef AIX
 #include <sys/pty.h>
-#include <unistd.h>
-#define UNISTD_H_INCLUDED
 #endif /* AIX */
 
-#ifdef IRIX4
-/* Get _getpty prototype */
-#include <unistd.h>
-#define UNISTD_H_INCLUDED
-#endif
-
-#if defined (POSIX) && !defined (UNISTD_H_INCLUDED) && defined (HAVE_UNISTD_H)
+#if (defined (POSIX) || defined (NEED_UNISTD_H)) && defined (HAVE_UNISTD_H)
 #include <unistd.h>
-#define UNISTD_H_INCLUDED
 #endif
 
 #ifdef SYSV_PTYS