(remove-overlays): Fix last change.

[gnu-emacs] / src / m / ibmrs6000.h

diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 11b0e519276adbecb997e313705b7ffa1cd11de4..3d3e45eda81cdb39942c7e17d73b296a5e9c0f84 100644 (file)
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -1,5 +1,6 @@
 /* R2 AIX machine/system dependent defines
-   Copyright (C) 1988 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,11 +16,11 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
-/* The following line tells the configuration script what sort of 
+/* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
    USUAL-OPSYS="aix3-1"  */
 
@@ -101,19 +102,6 @@ Boston, MA 02111-1307, USA.  */
 #undef ADDR_CORRECT
 #define ADDR_CORRECT(x) ((int)(x))
 
-/* Define C_ALLOCA if this machine does not support a true alloca
-   and the one written in C should be used instead.
-   Define HAVE_ALLOCA to say that the system provides a properly
-   working alloca function and it should be used.
-   Define neither one if an assembler-language alloca
-   in the file alloca.s should be used.         */
-
-/* Note: aix3-2.h defines HAVE_ALLOCA; aix3-1.h doesn't.  */
-#ifndef HAVE_ALLOCA
-#define C_ALLOCA
-#define STACK_DIRECTION -1 /* tell alloca.c which way it grows */
-#endif
-
 /* Specify the font for X to use.
    This used to be Rom14.500; that's nice on the X server shipped with
    the RS/6000, but it's not available on other servers.  */
@@ -125,7 +113,7 @@ Boston, MA 02111-1307, USA.  */
 #define OBJECTS_MACHINE hftctl.o
 #endif
 
-#ifndef USG5_4
+#ifndef USG5
 #define C_SWITCH_MACHINE -D_BSD
 #endif
 
@@ -148,9 +136,16 @@ Boston, MA 02111-1307, USA.  */
 
 #define START_FILES
 #define HAVE_SYSVIPC
-#define HAVE_GETWD
 /*** 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
@@ -165,9 +160,7 @@ Boston, MA 02111-1307, USA.  */
    which most machines don't have.  We use the name .inp instead of .imp
    because .inp is a better convention to use in make-dist for naming
    random input files.  */
-#ifdef emacs /* Prevent this from being used in configure.
-               This also makes it not be used in lib-src,
-               but that is probably ok.  */
+#ifdef THIS_IS_MAKEFILE /* Don't use this in configure.  */
 #ifdef AIX4
 #define LD_SWITCH_MACHINE -Wl,-bnodelcsect
 #else /* not AIX4 */
@@ -177,14 +170,19 @@ Boston, MA 02111-1307, USA.  */
 #define LD_SWITCH_MACHINE -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp
 #endif
 #endif /* not AIX4 */
-#endif
+#endif /* THIS_IS_MAKEFILE */
 
 /* Avoid gcc 2.7.x collect2 bug by using /bin/ld instead.  */
 #if __GNUC__ == 2 && __GNUC_MINOR__ == 7
 #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 */
+
+/* arch-tag: 028318ee-a7ae-4a08-804d-cc1e6588d003
+   (do not change this comment) */