diff options
| author | Eli Zaretskii | 2000-06-15 12:20:34 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2000-06-15 12:20:34 +0000 |
| commit | 8d228cb01bce3d6ed18494b86ac54fd89972ed5b (patch) | |
| tree | 19113bb7db33c1d6e631b32b9bb36db54d2a838f /src | |
| parent | e27e8d71b43d753945ea4136458a29700647c15c (diff) | |
| download | emacs-8d228cb01bce3d6ed18494b86ac54fd89972ed5b.tar.gz emacs-8d228cb01bce3d6ed18494b86ac54fd89972ed5b.zip | |
(toplevel): Fix last change, so as not to deprive MSDOS
of its headers.
Diffstat (limited to 'src')
| -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. | |||
| 173 | 173 | ||
| 174 | #ifdef COFF | 174 | #ifdef COFF |
| 175 | #include <coff.h> | 175 | #include <coff.h> |
| 176 | #else | ||
| 177 | #ifdef COFF_ENCAPSULATE | ||
| 178 | int need_coff_header = 1; | ||
| 179 | #include <coff-encap/a.out.encap.h> /* The location might be a poor assumption */ | ||
| 180 | #else | ||
| 181 | #ifdef MSDOS | 176 | #ifdef MSDOS |
| 182 | #if __DJGPP__ > 1 | 177 | #if __DJGPP__ > 1 |
| 183 | #include <fcntl.h> /* for O_RDONLY, O_RDWR */ | 178 | #include <fcntl.h> /* for O_RDONLY, O_RDWR */ |
| 184 | #include <crt0.h> /* for _crt0_startup_flags and its bits */ | 179 | #include <crt0.h> /* for _crt0_startup_flags and its bits */ |
| 185 | static int save_djgpp_startup_flags; | 180 | static int save_djgpp_startup_flags; |
| 186 | #endif | 181 | #endif /* __DJGPP__ > 1 */ |
| 187 | #include <coff.h> | ||
| 188 | #define filehdr external_filehdr | 182 | #define filehdr external_filehdr |
| 189 | #define scnhdr external_scnhdr | 183 | #define scnhdr external_scnhdr |
| 190 | #define syment external_syment | 184 | #define syment external_syment |
| @@ -202,12 +196,14 @@ struct aouthdr | |||
| 202 | unsigned long text_start;/* base of text used for this file */ | 196 | unsigned long text_start;/* base of text used for this file */ |
| 203 | unsigned long data_start;/* base of data used for this file */ | 197 | unsigned long data_start;/* base of data used for this file */ |
| 204 | }; | 198 | }; |
| 205 | |||
| 206 | |||
| 207 | #else /* not MSDOS */ | ||
| 208 | #include <a.out.h> | ||
| 209 | #endif /* not MSDOS */ | 199 | #endif /* not MSDOS */ |
| 210 | #endif | 200 | #else /* not COFF */ |
| 201 | #ifdef COFF_ENCAPSULATE | ||
| 202 | int need_coff_header = 1; | ||
| 203 | #include <coff-encap/a.out.encap.h> /* The location might be a poor assumption */ | ||
| 204 | #else /* not COFF_ENCAPSULATE */ | ||
| 205 | #include <a.out.h> | ||
| 206 | #endif /* not COFF_ENCAPSULATE */ | ||
| 211 | #endif /* not COFF */ | 207 | #endif /* not COFF */ |
| 212 | 208 | ||
| 213 | /* Define getpagesize if the system does not. | 209 | /* Define getpagesize if the system does not. |