Merge from emacs--rel--22

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

diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index 73d6aad267b56b05b6059b6cc1d35eab126b7340..5e982a314ab82db9ae8e8dcf6528a729a0e54165 100644 (file)
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -1,11 +1,12 @@
 /* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines
 /* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines

-   Copyright (C) 1986 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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
 
 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 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -15,26 +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
 
 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="usg5-3"  */
 
    operating system this machine is likely to run.
    USUAL-OPSYS="usg5-3"  */
 

-/* 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.  */
 
    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.  */
 
 /* 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.  */


@@ -83,17 +76,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* #define VIRT_ADDR_VARIES */  /* Karl Kleinpaste says this isn't needed.  */
 
 
 /* #define VIRT_ADDR_VARIES */  /* Karl Kleinpaste says this isn't needed.  */
 

-/* 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.  */
-

 /* SysV has alloca in the PW library */
 
 #define LIB_STANDARD -lPW -lc
 /* SysV has alloca in the PW library */
 
 #define LIB_STANDARD -lPW -lc

-#define HAVE_ALLOCA

 
 /* Define NO_REMAP if memory segmentation makes it not work well
    to change the boundary between the text section and data section
 
 /* Define NO_REMAP if memory segmentation makes it not work well
    to change the boundary between the text section and data section


@@ -125,3 +110,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define HAVE_PTYS                      /* we do have PTYs if we have TCP */
 #define HAVE_SOCKETS                   /* we do have sockets if we have TCP */
 #define LIBS_SYSTEM -lsocket           /* get TCP networking functions */
 #define HAVE_PTYS                      /* we do have PTYs if we have TCP */
 #define HAVE_SOCKETS                   /* we do have sockets if we have TCP */
 #define LIBS_SYSTEM -lsocket           /* get TCP networking functions */

+
+/* arch-tag: e0c09754-b0f2-48da-a8a5-aee3c94838f4
+   (do not change this comment) */