(remove-overlays): Fix last change.

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

diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
index dac44ac41c8c1eecfb48d25bc34b139b9c5a65ea..f8df583657a933deb961d95581d4bab46ebc58f5 100644 (file)
--- a/src/m/cnvrgnt.h
+++ b/src/m/cnvrgnt.h
@@ -1,11 +1,12 @@
 /* machine description file for convergent S series.
-   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.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -15,22 +16,14 @@ 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 three symbols give information on
- the size of various data types.  */
-
-#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 BIG_ENDIAN iff lowest-numbered byte in a word
+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
    is the most significant byte.  */
 
-#define BIG_ENDIAN
+#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.  */
@@ -84,16 +77,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #undef 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
-#undef HAVE_ALLOCA
-
 /* 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
@@ -105,15 +88,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define SWITCH_ENUM_BUG
 
-/* fork(2) and vfork() are the same here.  */
-
-#define HAVE_VFORK
-
-/* grows towards lower addresses.  */
-
-#define        STACK_DIRECTION -1
-
 /* some errno.h's don't actually allocate the variable itself.
    Cause crt0.c to define errno.  */
 
 #define NEED_ERRNO
+
+/* arch-tag: 1a227f79-37e4-43af-a186-53c61296b0be
+   (do not change this comment) */