(font_for_char): Use assq_no_quit, not assoc_no_quit.

[gnu-emacs] / src / unexaix.c

diff --git a/src/unexaix.c b/src/unexaix.c
index 17df5b5174ba6b4c9b5a3bd0b0fc2d2ae68c9ac5..c224a3626fec3e4b75674df9ac306d381f9a4565 100644 (file)
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -1,12 +1,13 @@
 /* Dump an executable image.
-   Copyright (C) 1985, 1986, 1987, 1988, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+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 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,10 +15,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/*
 In other words, you are welcome to use, share and improve this program.
 You are forbidden to forbid anyone else to use, share and improve
 what you give them.   Help stamp out software-hoarding!  */
@@ -103,14 +103,6 @@ static int adjust_lnnoptrs (int, int, char *);
 
 static int pagemask;
 
-/* Correct an int which is the bit pattern of a pointer to a byte
-   into an int which is the number of a byte.
-   This is a no-op on ordinary machines, but not on all.  */
-
-#ifndef ADDR_CORRECT   /* Let m-*.h files override this definition */
-#define ADDR_CORRECT(x) ((char *)(x) - (char*)0)
-#endif
-
 #ifdef emacs
 #include "lisp.h"
 
@@ -175,7 +167,7 @@ int unexec (char *new_name, char *a_name,
       || unrelocate_symbols (new, a_out, a_name, new_name) < 0)
     {
       close (new);
-      return -1;       
+      return -1;
     }
 
   close (new);
@@ -358,7 +350,7 @@ make_hdr (int new, int a_out,
            s->s_scnptr += bias;
            ptr = s->s_scnptr;
          }
-  
+
        ptr = ptr + s->s_size;
       }
   }
@@ -413,7 +405,7 @@ make_hdr (int new, int a_out,
 }
 \f
 /* ****************************************************************
- 
+
  *
  * Copy the text and data segments from memory to the new a.out
  */
@@ -589,7 +581,7 @@ unrelocate_symbols (int new, int a_out, char *a_name, char *new_name)
 #ifndef ALIGN_DATA_RELOC
   ulong d_reloc = (ulong) &_data - f_ohdr.data_start;
 #else
-  /* This worked (and was needed) before AIX 4.2. 
+  /* This worked (and was needed) before AIX 4.2.
      I have no idea why. -- Mike */
   ulong d_reloc = (ulong) &_data - ALIGN(f_ohdr.data_start, 2);
 #endif
@@ -676,3 +668,6 @@ unrelocate_symbols (int new, int a_out, char *a_name, char *new_name)
     }
   return 0;
 }
+
+/* arch-tag: 0783857a-7c2d-456f-a426-58b722d69fd0
+   (do not change this comment) */