Mercurial > emacs
changeset 29668:1e6eeead2f1d
(toplevel): Fix last change, so as not to deprive MSDOS
of its headers.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Thu, 15 Jun 2000 12:20:34 +0000 |
| parents | 2bf185a87bcb |
| children | 50fecf68aa38 |
| files | src/unexec.c |
| diffstat | 1 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/unexec.c Thu Jun 15 12:00:39 2000 +0000 +++ b/src/unexec.c Thu Jun 15 12:20:34 2000 +0000 @@ -173,18 +173,12 @@ #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 @@ 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 */ +#endif /* not MSDOS */ +#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 MSDOS */ -#endif +#endif /* not COFF_ENCAPSULATE */ #endif /* not COFF */ /* Define getpagesize if the system does not.