--- a/src/unexelfsgi.c	Mon Aug 13 10:20:01 2007 +0200
+++ b/src/unexelfsgi.c	Mon Aug 13 10:20:27 2007 +0200
@@ -498,7 +498,7 @@
 #include <sym.h> /* for HDRR declaration */
 #include <sys/mman.h>
 #include <config.h>
-#include "sysdep.h"
+#include "lisp.h"
 
 /* in 64bits mode, use 64bits elf */
 #ifdef _ABI64
@@ -520,12 +520,6 @@
 #endif
 
 
-#ifndef emacs
-#define fatal(a, b, c) fprintf(stderr, a, b, c), exit(1)
-#else
-extern void fatal(char *, ...);
-#endif
-
 /* Get the address of a particular section or program header entry,
  * accounting for the size of the entries.
  */
@@ -605,7 +599,7 @@
  * .data section, and inserting an empty .bss immediately afterwards.
  *
  */
-void
+int
 unexec (new_name, old_name, data_start, bss_start, entry_address)
      char *new_name, *old_name;
      uintptr_t data_start, bss_start, entry_address;
@@ -1011,4 +1005,6 @@
   stat_buf.st_mode |= 0111 & ~n;
   if (chmod (new_name, stat_buf.st_mode) == -1)
     fatal ("Can't chmod (%s): errno %d\n", new_name, errno);
+
+  return 0;
 }