diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2000-06-15 12:20:34 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2000-06-15 12:20:34 +0000 |
| commit | 05a09f8e2b3f48c4b5a096322660f99fa667a144 (patch) | |
| tree | e46b6d2febf4128ad1ff2e8154fe4eac9ce08b3c /src/unexec.c | |
| parent | e9c6d31fade5b153467cc80155147f946f234224 (diff) | |
| download | emacs-05a09f8e2b3f48c4b5a096322660f99fa667a144.tar.gz | |
(toplevel): Fix last change, so as not to deprive MSDOS
of its headers.
Diffstat (limited to 'src/unexec.c')
| -rw-r--r-- | src/unexec.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/unexec.c b/src/unexec.c index 588ca15dac4..7dac7323ff3 100644 --- a/src/unexec.c +++ b/src/unexec.c @@ -173,18 +173,12 @@ pointer looks like an int) but not on all machines. #ifdef COFF #include <coff.h> -#else -#ifdef COFF_ENCAPSULATE -int need_coff_header = 1; -#include <coff-encap/a.out.encap.h> /* The location might be a poor assumption */ -#else #ifdef MSDOS #if __DJGPP__ > 1 #include <fcntl.h> /* for O_RDONLY, O_RDWR */ #include <crt0.h> /* for _crt0_startup_flags and its bits */ static int save_djgpp_startup_flags; -#endif -#include <coff.h> +#endif /* __DJGPP__ > 1 */ #define filehdr external_filehdr #define scnhdr external_scnhdr #define syment external_syment @@ -202,12 +196,14 @@ struct aouthdr unsigned long text_start;/* base of text used for this file */ unsigned long data_start;/* base of data used for this file */ }; - - -#else /* not MSDOS */ -#include <a.out.h> #endif /* not MSDOS */ -#endif +#else /* not COFF */ +#ifdef COFF_ENCAPSULATE +int need_coff_header = 1; +#include <coff-encap/a.out.encap.h> /* The location might be a poor assumption */ +#else /* not COFF_ENCAPSULATE */ +#include <a.out.h> +#endif /* not COFF_ENCAPSULATE */ #endif /* not COFF */ /* Define getpagesize if the system does not. |