diff options
| author | Eli Zaretskii | 2010-10-15 20:42:54 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-10-15 20:42:54 +0200 |
| commit | c3911ead5daf93b59e29e03b5df47a8aec770b46 (patch) | |
| tree | 36a527c6f317f656949586c97a9b4646cd0a51ee /src | |
| parent | aa095b2db98ae149737f8de00ee733b1d257ed33 (diff) | |
| download | emacs-c3911ead5daf93b59e29e03b5df47a8aec770b46.tar.gz emacs-c3911ead5daf93b59e29e03b5df47a8aec770b46.zip | |
Fix the MSDOS build broken by latest revisions.
src/unexcoff.c (make_hdr): Fix prototype according to changes in
2010-10-03T13:59:56Z!dann@ics.uci.edu.
msdos/sed1v2.inp: Use $(..) instead of ${..} in all edit commands.
Needed because of changes in 2010-10-10T14:43:05Z!dann@ics.uci.edu.
msdos/sed6.inp (mkinfodir): Edit to avoid Unix shell-isms. Needed
because of changes in 2010-10-09T18:31:12Z!rgm@gnu.org.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/unexcoff.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 567bf2868e7..b3ed712a9e5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-10-15 Eli Zaretskii <eliz@gnu.org> | 1 | 2010-10-15 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * unexcoff.c (make_hdr): Fix prototype according to changes in | ||
| 4 | 2010-10-03T13:59:56Z!dann@ics.uci.edu. | ||
| 5 | |||
| 3 | * image.c (tiff_load): Cast 3rd argument to avoid compiler warning. | 6 | * image.c (tiff_load): Cast 3rd argument to avoid compiler warning. |
| 4 | 7 | ||
| 5 | 2010-10-15 Tassilo Horn <tassilo@member.fsf.org> | 8 | 2010-10-15 Tassilo Horn <tassilo@member.fsf.org> |
diff --git a/src/unexcoff.c b/src/unexcoff.c index 0c6af414d82..fb221dacda2 100644 --- a/src/unexcoff.c +++ b/src/unexcoff.c | |||
| @@ -141,8 +141,7 @@ report_error_1 (int fd, const char *msg, int a1, int a2) | |||
| 141 | error (msg, a1, a2); | 141 | error (msg, a1, a2); |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | static int make_hdr (int, int, unsigned, unsigned, unsigned, | 144 | static int make_hdr (int, int, const char *, const char *); |
| 145 | const char *, const char *); | ||
| 146 | static int copy_text_and_data (int, int); | 145 | static int copy_text_and_data (int, int); |
| 147 | static int copy_sym (int, int, const char *, const char *); | 146 | static int copy_sym (int, int, const char *, const char *); |
| 148 | static void mark_x (const char *); | 147 | static void mark_x (const char *); |