(remove-overlays): Fix last change.

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

diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index 9663a5b4743aea89c2d6c560033e8f733da08276..9760b9bd2edf68d32cddb7c9d7beaeae02cf702d 100644 (file)
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -1,11 +1,12 @@
 /* machine description file for hp9000 series 200 or 300 on either HPUX or BSD.
-   Copyright (C) 1985 Free Software Foundation, Inc.
+   Copyright (C) 1985, 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,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"
 
@@ -32,6 +34,9 @@ HP 9000 series 200 or 300 (-machine=hp9000s300)
   If you're running BSD, specify `-opsystem=bsd4-3'.
 NOTE-END */
 
+/* I don't understand why we have to do this at all!  -JimB */
+#if 0
+
 /* Do this here at the top of the file; including sys/wait.h may
    include <endian.h>, which defines BIG_ENDIAN, which will conflict
    with our definition of BIG_ENDIAN if we do this at the bottom.  */
@@ -43,6 +48,8 @@ NOTE-END */
 #define WRETCODE(w) (((w) >> 8) & 0377)
 #endif
 
+#endif
+
 /* Define NOMULTIPLEJOBS on versions of HPUX before 6.5.  */
 
 /* #define NOMULTIPLEJOBS */
@@ -52,21 +59,10 @@ NOTE-END */
 
 /* #define HPUX_5 */
 
-/* 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.  */
-/* Under BSD, <endian.h> defines this.  */
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN
-#endif
+
+#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.  */
@@ -113,7 +109,7 @@ NOTE-END */
 
 /* #define VIRT_ADDR_VARIES */
 \f
-/* For University of Utah 4.3bsd implemetation on HP300s.
+/* For University of Utah 4.3bsd implementation on HP300s.
    The #ifndef __GNUC__ definitions are required for the "standard" cc,
    a very old, brain-dead version of PCC. */
 
@@ -125,8 +121,6 @@ NOTE-END */
 
 #define CRT0_DUMMIES           bogus_a6,
 
-#define HAVE_ALLOCA
-
 #ifndef __GNUC__
 #define LIBS_DEBUG             /* don't have -lg that works */
 #define C_DEBUG_SWITCH         /* don't support -g */
@@ -161,6 +155,11 @@ NOTE-END */
 #define LIBS_DEBUG /usr/lib/end.o
 #endif
 
+/* Need a TEXT_START.  On the HP9000/s300 that is 0.  */
+#ifdef __GNUC__
+#define TEXT_START   0
+#endif
+
 /* The symbol FIONREAD is defined, but the feature does not work
    on the 200/300.  */
 
@@ -224,3 +223,6 @@ NOTE-END */
 #endif
 
 #endif /* not BSD4_3 */
+
+/* arch-tag: 6e0001a5-ed62-4258-9235-204348f6bdb9
+   (do not change this comment) */