(remove-overlays): Fix last change.

[gnu-emacs] / src / m / ibmps2-aix.h

diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
index cd31da40ac6055a50d0c60a805b5207902ab3704..ea895cd4fd8fbe54da965f72d72b3d14e4112550 100644 (file)
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -1,5 +1,6 @@
 /* machine description file for ibm ps/2 aix386.
-   Copyright (C) 1989 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,10 +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, 675 Mass Ave, Cambridge, MA 02139, 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="note"
 
@@ -28,18 +30,10 @@ NOTE-START
   work with certain new X window managers, and may be suboptimal.
 NOTE-END */
 
-/* The following three symbols give information on
- the size of various data types.  */
+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
+   is the most significant byte.  */
 
-#define SHORTBITS 16           /* Number of bits in a short */
-
-#define INTBITS 32             /* Number of bits in an int */
-
-#define LONGBITS 32            /* Number of bits in a long */
-
-/* i386 is not big-endian: lowest numbered byte is least significant. */
-
-/* #undef BIG_ENDIAN */
+#undef WORDS_BIG_ENDIAN
 
 /* Define NO_ARG_ARRAY if you cannot take the address of the first of a
  * group of arguments and treat it as an array of the arguments.  */
@@ -58,8 +52,6 @@ NOTE-END */
 
 #define INTEL386
 #define aix386
-#undef  SYSTEM_TYPE
-#define SYSTEM_TYPE "ibm-aix-386"
 
 #define IBMAIX
 
@@ -123,10 +115,6 @@ so disable it for them.  */
 #endif
 
 #define BSTRING
-#define HAVE_SELECT
-#define HAVE_TIMEVAL
-#define HAVE_VFORK
-#define HAVE_SETSID
 #undef  HAVE_TERMIO
 #define HAVE_TERMIOS
 
@@ -147,8 +135,8 @@ so disable it for them.  */
  */
 #undef  NONSYSTEM_DIR_LIBRARY
 
-/* But don't use utimes() -- it causes SIGSEGV!  Use utime() instead. */
-#define USE_UTIME
+/* AIX utimes allegedly causes SIGSEGV.  */
+#undef HAVE_UTIMES /* override configuration decision */
 
 /* AIX defines FIONREAD, but it does not work.  */
 #define BROKEN_FIONREAD
@@ -200,25 +188,15 @@ so disable it for them.  */
 
 /* Here override various assumptions in ymakefile */
 
-/* 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.  */
-
 #ifdef __GNUC__
-#define HAVE_ALLOCA
 #define alloca(n) __builtin_alloca(n)
 #if __GNUC__ < 2
-#define LIB_STANDARD /usr/local/lib/gcc-gnulib -lbsd -lrts -lc 
+#define LIB_STANDARD /usr/local/lib/gcc-gnulib -lbsd -lrts -lc
 #endif
 /* -g fails to work, so it is omitted.  */
 /* tranle says that -fstrength-reduce does not help.  */
 #define C_DEBUG_SWITCH
 #else
-#define C_ALLOCA
-#define STACK_DIRECTION -1 /* tell alloca.c which way it grows */
 #define LIBS_MACHINE -lbsd -lrts
 #endif
 
@@ -228,7 +206,6 @@ so disable it for them.  */
 
 #ifdef USG5_3
 #define XICCC
-#define HAVE_GETWD
 #undef LD_SWITCH_MACHINE
 #define LD_SWITCH_MACHINE -T0x0 -K -e start
 
@@ -254,3 +231,6 @@ so disable it for them.  */
 #define LD_SWITCH_MACHINE -shlib
 #endif
 #endif
+
+/* arch-tag: 2e7f44df-6a61-4a47-aa53-f7961bfeff11
+   (do not change this comment) */