Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org

[bpt/emacs.git] / src / unexcoff.c

diff --git a/src/unexcoff.c b/src/unexcoff.c
index ef86a40..466a5c0 100644 (file)
--- a/src/unexcoff.c
+++ b/src/unexcoff.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1985-1988, 1992-1994, 2001-2011  Free Software Foundation, Inc.
+/* Copyright (C) 1985-1988, 1992-1994, 2001-2013 Free Software
+ * Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -98,7 +99,7 @@ struct aouthdr
 
 #include <sys/file.h>
 
-extern char *start_of_data (void);             /* Start of initialized data */
+#include "mem-limits.h"
 
 static long block_copy_start;          /* Old executable start point */
 static struct filehdr f_hdr;           /* File header */
@@ -120,7 +121,6 @@ static int pagemask;
 
 #define ADDR_CORRECT(x) ((char *)(x) - (char*)0)
 
-#include <setjmp.h>
 #include "lisp.h"
 
 static void
@@ -333,11 +333,7 @@ write_segment (int new, const char *ptr, const char *end)
         a gap between the old text segment and the old data segment.
         This gap has probably been remapped into part of the text segment.
         So write zeros for it.  */
-      if (ret == -1
-#ifdef EFAULT
-         && errno == EFAULT
-#endif
-         )
+      if (ret == -1 && errno == EFAULT)
        {
          /* Write only a page of zeros at once,
             so that we don't overshoot the start