diff options
| author | Jim Blandy <jimb@redhat.com> | 1993-05-04 02:44:16 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 1993-05-04 02:44:16 +0000 |
| commit | f80dc88865694fb162f61e8857fe1ef857b493e6 (patch) | |
| tree | 9e49317da6d782d43844bff4d6aede0e42973f87 /src/unexnext.c | |
| parent | d82222e114a8fdf1fbe0ca295497186189edd225 (diff) | |
| download | emacs-f80dc88865694fb162f61e8857fe1ef857b493e6.tar.gz | |
Changes for Emacs 19 from Thorsten Ohl <ohl@chico.harvard.edu>:
* s/mach2.h: copied from the Emacs 18.59 distribution.
Don't define NO_REMAP, define START_FILES as
`pre-crt0.o' instead. Define LIB_MATH as `-lm', to override the
default `-lm -lc' (there is no libc on the NeXT).
* ymakefile (STARTFILES): Allow config.h to set this value even if
ORDINARY_LINK is defined.
* unexnext.c: Fix subdirectories for the machine dependent include
files for NeXTStep 3.0; #include <mach/mach.h> and
<mach-o/loader.h> instead of <mach.h> and <sys/loader.h>.
(getsectbyname): Remove prototype for this; the system #include
files take care of that.
(malloc_cookie): New variable.
(unexec_doit): Set malloc_cookie to the result returned by
malloc_freezedry.
* emacs.c (main): Declare malloc_cookie to be extern, so that we can
get the value set when we dumped and pass it to malloc_jumpstart.
* systime.h: The NeXT has a timezone function.
Diffstat (limited to 'src/unexnext.c')
| -rw-r--r-- | src/unexnext.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/unexnext.c b/src/unexnext.c index 08fe46489a3..d03808bad4f 100644 --- a/src/unexnext.c +++ b/src/unexnext.c @@ -1,12 +1,12 @@ /* Dump Emacs in macho format. - Copyright (C) 1990 Free Software Foundation, Inc. + Copyright (C) 1990, 1993 Free Software Foundation, Inc. Written by Bradley Taylor (btaylor@next.com). This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 1, or (at your option) +the Free Software Foundation; either version 2, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, @@ -24,14 +24,14 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> -#include <mach.h> -#include <sys/loader.h> +#include <mach/mach.h> +#include <mach-o/loader.h> #include <sys/file.h> #include <sys/stat.h> #include <libc.h> -extern struct section *getsectbyname(char *, char *); +int malloc_cookie; /* * Kludge: we don't expect any program data beyond VM_HIGHDATA @@ -258,10 +258,7 @@ unexec_doit( } - { - extern int malloc_cookie; - malloc_cookie = malloc_freezedry(); - } + malloc_cookie = malloc_freezedry (); if (!get_data_region(&data_address, &data_size)) { return (0); } |