(remove-overlays): Fix last change.

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

diff --git a/src/m/sr2k.h b/src/m/sr2k.h
index 7aed1348377c4591806712e1fac0c442e1d68871..14a90c666f46a97fc8c4debb66e8c1ee4f761167 100644 (file)
--- a/src/m/sr2k.h
+++ b/src/m/sr2k.h
@@ -1,5 +1,6 @@
 /* machine description file for Hitachi SR2001/SR2201 machines.
-   Copyright (C) 1996, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1996, 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="hpux"  */
 
@@ -61,29 +62,12 @@ Boston, MA 02111-1307, USA.  */
 
 /* The standard definitions of these macros would work ok,
    but these are faster because the constants are short. */
-   
+
 
 #define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)
 
 #define XSET(var, type, ptr) \
    ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-#define XMARKBIT(a) ((a) < 0)
-#define XSETMARKBIT(a,b) ((a) = ((b) ? (a)|MARKBIT : (a) & ~MARKBIT))
-
-#if 0  /* Loses when sign bit of type field is set.  */
-#define XUNMARK(a) ((a) = (((a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS))
-#endif
-
-/* Define the BSTRING functions in terms of the sysV functions. */
-/* On HPUX 8.05, including types.h can include strings.h
-   which declares these as functions.  Hence the #ifndef.  */
-
-#ifndef HAVE_BCOPY
-#define bcopy(a,b,s)   memcpy (b,a,s)
-#define bzero(a,s)     memset (a,0,s)
-#define bcmp           memcmp
-#endif
 \f
 /* #ifdef __hpux */
 /* Now define a symbol for the cpu type, if your compiler
@@ -171,3 +155,6 @@ Boston, MA 02111-1307, USA.  */
 #define rindex strrchr
 
 /* #endif */
+
+/* arch-tag: 4ced5b51-ffe6-4be1-9954-eb40657023a5
+   (do not change this comment) */