Merge from emacs-24; up to 2012-05-07T14:57:18Z!michael.albinus@gmx.de

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

diff --git a/src/unexcoff.c b/src/unexcoff.c
index ef86a40..966dd58 100644 (file)
--- a/src/unexcoff.c
+++ b/src/unexcoff.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1985-1988, 1992-1994, 2001-2011  Free Software Foundation, Inc.
+/* Copyright (C) 1985-1988, 1992-1994, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -98,7 +98,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 +120,6 @@ static int pagemask;
 
 #define ADDR_CORRECT(x) ((char *)(x) - (char*)0)
 
-#include <setjmp.h>
 #include "lisp.h"
 
 static void