(BROKEN_SIGAIO, BROKEN_SIGPTY, BROKEN_SIGPOLL):

Defined these macros.
(NLIST_STRUCT): Avoid re-defining it.

diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 56756ed..8500ee9 100644 (file)
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -150,6 +150,14 @@ Boston, MA 02111-1307, USA.  */
 #define HAVE_SYSVIPC
 /*** BUILD 9008 - FIONREAD problem still exists in X-Windows. ***/
 #define BROKEN_FIONREAD
+/* As we define BROKEN_FIONREAD, SIGIO will be undefined in systty.h.
+   But, on AIX, SIGAIO, SIGPTY, and SIGPOLL are defined as SIGIO,
+   which causes compilation error at init_signals in sysdep.c.  So, we
+   define these macros so that syssignal.h detects them and undefine
+   SIGAIO, SIGPTY and SIGPOLL.  */
+#define BROKEN_SIGAIO
+#define BROKEN_SIGPTY
+#define BROKEN_SIGPOLL
 
 /* Don't try to include sioctl.h or ptem.h.  */
 #undef NEED_SIOCTL
@@ -181,7 +189,9 @@ Boston, MA 02111-1307, USA.  */
 #define LD_SWITCH_SITE -B/bin/
 #endif
 
+#ifndef NLIST_STRUCT
 /* AIX supposedly doesn't use this interface, but on the RS/6000
    it apparently does.  */
 #define NLIST_STRUCT
+#endif
 #endif /* USG5_4 */