(remove-overlays): Fix last change.

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

diff --git a/src/m/convex.h b/src/m/convex.h
index e4afbade94cf9201a297ef84d28dacca117edeb2..fa87d89e3d3a4ce785826db4690a2c6864700f47 100644 (file)
--- a/src/m/convex.h
+++ b/src/m/convex.h
@@ -1,5 +1,6 @@
 /* machine description file for Convex (all models).
-   Copyright (C) 1987, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1994, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,21 +16,18 @@ 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="bsd4-3"  */
 
-/* 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 */
+#define 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.
@@ -41,7 +39,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  * to be corrected before they can be used as byte counts.  */
 
 /* #define WORD_MACHINE */
-  
+
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically.  */
 #ifndef convex  /* The compiler doesn't always do this.  */
@@ -57,7 +55,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
                    and Ralph Sobek <Ralph.Sobek@cerfacs.fr> agree
                    must ignore one arg when compiled with convex compiler.  */
 #define CRT0_DUMMIES ignore,
-#else 
+#else
 #define CRT0_DUMMIES
 #endif
 
@@ -88,20 +86,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*#define VIRT_ADDR_VARIES*/
 
-/* 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.  */
-
-/* #define C_ALLOCA */
-#define HAVE_ALLOCA
-
 /* Must use the system's termcap.  It does special things.  */
-  
+
 #define LIBS_TERMCAP -ltermcap
-  
+
 /* Define NO_REMAP if memory segmentation makes it not work well
    to change the boundary between the text section and data section
    when Emacs is dumped.  If you define this, the preloaded Lisp
@@ -110,7 +98,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* #define NO_REMAP */
 \f
 /* Addresses on the Convex have the high bit set.  */
-#define DATA_SEG_BITS (1 << (INTBITS-1))
+#define DATA_SEG_BITS (1 << (BITS_PER_INT-1))
 
 /* Right shift is logical shift.
    And the usual way of handling such machines, which involves
@@ -192,3 +180,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
     -L /usr/lib \
     '-A__iob=___ap$$iob' '-A_use_libc_sema=___ap$$use_libc_sema'
 #endif
+
+/* There is some indication that the convex has sys/wait.h
+   but it does not work right.  */
+#undef HAVE_SYS_WAIT_H
+
+/* arch-tag: 127e5ae1-4f03-40c0-a87e-d2cb02c59de8
+   (do not change this comment) */