From 8d228cb01bce3d6ed18494b86ac54fd89972ed5b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 15 Jun 2000 12:20:34 +0000 Subject: [PATCH] (toplevel): Fix last change, so as not to deprive MSDOS of its headers. --- src/unexec.c | 20 ++++++++------------ 1 file 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 -#else -#ifdef COFF_ENCAPSULATE -int need_coff_header = 1; -#include /* The location might be a poor assumption */ -#else #ifdef MSDOS #if __DJGPP__ > 1 #include /* for O_RDONLY, O_RDWR */ #include /* for _crt0_startup_flags and its bits */ static int save_djgpp_startup_flags; -#endif -#include +#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 #endif /* not MSDOS */ -#endif +#else /* not COFF */ +#ifdef COFF_ENCAPSULATE +int need_coff_header = 1; +#include /* The location might be a poor assumption */ +#else /* not COFF_ENCAPSULATE */ +#include +#endif /* not COFF_ENCAPSULATE */ #endif /* not COFF */ /* Define getpagesize if the system does not. -- 2.39.5