aboutsummaryrefslogtreecommitdiffstats
path: root/src/unexmacosx.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/unexmacosx.c')
-rw-r--r--src/unexmacosx.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 7a55498085d..04e3edf463e 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -95,6 +95,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
95#undef malloc 95#undef malloc
96#undef realloc 96#undef realloc
97#undef free 97#undef free
98
99#include "unexec.h"
100
98#include <stdio.h> 101#include <stdio.h>
99#include <fcntl.h> 102#include <fcntl.h>
100#include <stdarg.h> 103#include <stdarg.h>
@@ -828,6 +831,7 @@ copy_data_segment (struct load_command *lc)
828 } 831 }
829 else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0 832 else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
830 || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0 833 || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
834 || strncmp (sectp->sectname, "__got", 16) == 0
831 || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0 835 || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0
832 || strncmp (sectp->sectname, "__dyld", 16) == 0 836 || strncmp (sectp->sectname, "__dyld", 16) == 0
833 || strncmp (sectp->sectname, "__const", 16) == 0 837 || strncmp (sectp->sectname, "__const", 16) == 0
@@ -1223,7 +1227,7 @@ dump_it (void)
1223 from it. The file names of the output and input files are outfile 1227 from it. The file names of the output and input files are outfile
1224 and infile, respectively. The three other parameters are 1228 and infile, respectively. The three other parameters are
1225 ignored. */ 1229 ignored. */
1226int 1230void
1227unexec (const char *outfile, const char *infile) 1231unexec (const char *outfile, const char *infile)
1228{ 1232{
1229 if (in_dumped_exec) 1233 if (in_dumped_exec)
@@ -1254,7 +1258,6 @@ unexec (const char *outfile, const char *infile)
1254 dump_it (); 1258 dump_it ();
1255 1259
1256 close (outfd); 1260 close (outfd);
1257 return 0;
1258} 1261}
1259 1262
1260 1263
@@ -1379,4 +1382,3 @@ unexec_free (void *ptr)
1379 else 1382 else
1380 malloc_zone_free (emacs_zone, (unexec_malloc_header_t *) ptr - 1); 1383 malloc_zone_free (emacs_zone, (unexec_malloc_header_t *) ptr - 1);
1381} 1384}
1382