(remove-overlays): Fix last change.

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

diff --git a/src/m/alliant.h b/src/m/alliant.h
index 084054084422cd2f3fd34f3df7ce4e7384179f9f..49459c0b7f7d09c3308d6522152691919afce13a 100644 (file)
--- a/src/m/alliant.h
+++ b/src/m/alliant.h
@@ -1,5 +1,6 @@
 /* alliant.h  Alliant machine running system version 2 or 3.
-   Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.
    Note that for version 1 of the Alliant system
    you should use alliant1.h instead of this file.
    Use alliant4.h for version 4.
@@ -18,21 +19,13 @@ 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-2"  */
 
-/* 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 WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
    is the most significant byte.  */
 
@@ -91,21 +84,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.  */
-
-#undef C_ALLOCA
-#define HAVE_ALLOCA
-
-#ifdef ALLIANT_1
-#define C_ALLOCA
-#undef HAVE_ALLOCA
-#endif /* ALLIANT_1 */
-
 /* 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
@@ -140,3 +118,6 @@ unexec_text_start = hdr.a_text_addr;}
    a variable name causes errors when compiling under ANSI C.  */
 
 #define vector xxvector
+
+/* arch-tag: 0ad5f932-f29a-4458-a24c-496cafdfd50d
+   (do not change this comment) */