Merge from emacs-24; up to 2012-12-20T05:05:41Z!dmantipov@yandex.ru

[gnu-emacs] / src / unexsol.c

diff --git a/src/unexsol.c b/src/unexsol.c
index ae91c1708593c15cb1cd279ecdf37d8ce9f4f68a..470206d58387fc27b95c35ac01303c57ce9d1a52 100644 (file)
--- a/src/unexsol.c
+++ b/src/unexsol.c
@@ -4,21 +4,21 @@
 #include "unexec.h"
 
 #include <dlfcn.h>
-#include <setjmp.h>
 
 #include "lisp.h"
+#include "character.h"
 #include "buffer.h"
 #include "charset.h"
 #include "coding.h"
 
-int
+void
 unexec (const char *new_name, const char *old_name)
 {
   Lisp_Object data;
   Lisp_Object errstring;
 
   if (! dldump (0, new_name, RTLD_MEMORY))
-    return 0;
+    return;
 
   data = Fcons (build_string (new_name), Qnil);
   synchronize_system_messages_locale ();
@@ -28,4 +28,3 @@ unexec (const char *new_name, const char *old_name)
   xsignal (Qfile_error,
           Fcons (build_string ("Cannot unexec"), Fcons (errstring, data)));
 }
-