From 7fc47afa703dd10e98f7eb94576ee6987599bcff Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 16 Nov 2001 13:46:27 +0000 Subject: [PATCH] (coff.h): Don't include on ISC 4.1. --- src/ChangeLog | 7 +++++++ src/unexec.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 38f281d0a14..9899ee2b1b4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2001-11-16 Eli Zaretskii + + * syswait.h (HAVE_SYS_WAIT_H): Undef for ISC 4.1. Reported by + Andrew Wiseman . + + * unexec.c (coff.h): Don't include on ISC 4.1. + 2001-11-15 Jason Rumney * w32menu.c (add_menu_item): Make help_echo and radio buttons diff --git a/src/unexec.c b/src/unexec.c index fb00c27e54b..b84152aca62 100644 --- a/src/unexec.c +++ b/src/unexec.c @@ -171,7 +171,7 @@ pointer looks like an int) but not on all machines. #ifndef CANNOT_DUMP /* all rest of file! */ -#ifdef COFF +#if defined(COFF) && !defined(ISC4_1) #include #ifdef MSDOS #if __DJGPP__ > 1 @@ -197,14 +197,14 @@ struct aouthdr unsigned long data_start;/* base of data used for this file */ }; #endif /* not MSDOS */ -#else /* not COFF */ +#else /* not COFF and ISC4_1 */ #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 */ +#endif /* not COFF and ISC4_1 */ /* Define getpagesize if the system does not. Note that this may depend on symbols defined in a.out.h. */ -- 2.39.2