(remove-overlays): Fix last change.

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

diff --git a/src/m/vax.h b/src/m/vax.h
index d651d74f37f7ae7712e556db6e8587ef318bf612..9332b8f494dd1439e5e747f55af85587558736b3 100644 (file)
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -1,5 +1,6 @@
 /* machine description file for vax.
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,11 +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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, 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"
 
@@ -70,7 +71,7 @@ NOTE-END  */
 
 #define DOT_GLOBAL_START
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
 /* USG systems I know of running on Vaxes do not actually
    support the load average, so disable it for them.  */
 
@@ -82,7 +83,7 @@ NOTE-END  */
 
 #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
 
-#endif /* BSD */
+#endif /* BSD_SYSTEM */
 
 #ifdef VMS
 
@@ -100,7 +101,6 @@ NOTE-END  */
 
 #ifdef USG
 #define LIB_STANDARD -lPW -lc
-#define HAVE_ALLOCA
 
 /* There is some bug in unexec in for usg 5.2 on a vax
    which nobody who runs such a system has yet tracked down. */
@@ -111,14 +111,9 @@ NOTE-END  */
 #define TEXT_START 0
 #endif /* USG */
 
-#ifdef BSD
-#define HAVE_ALLOCA
-#endif /* BSD */
-
-#ifdef VMS
-#define C_ALLOCA
-#endif
-
 #ifdef BSD4_2
 #define HAVE_FTIME
 #endif
+
+/* arch-tag: 508bdf7a-01a0-4ce0-8eba-0704d0df55a0
+   (do not change this comment) */