aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2010-10-15 20:45:12 +0200
committerEli Zaretskii2010-10-15 20:45:12 +0200
commite3fc5b1907be5444ca6315c531ecff81e77c7bdb (patch)
treeb4e74e96f0880d8842f8f8b300e6e5c4cb0d4b90 /src
parent4c0f50c9562d8a20a2768d62bd37d2e144fd9c4a (diff)
parentc3911ead5daf93b59e29e03b5df47a8aec770b46 (diff)
downloademacs-e3fc5b1907be5444ca6315c531ecff81e77c7bdb.tar.gz
emacs-e3fc5b1907be5444ca6315c531ecff81e77c7bdb.zip
Fix the MSDOS build broken by last revisions.
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. src/unexcoff.c (make_hdr): Fix prototype according to changes in 2010-10-03T13:59:56Z!dann@ics.uci.edu.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/unexcoff.c3
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 @@
12010-10-15 Eli Zaretskii <eliz@gnu.org> 12010-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
52010-10-15 Tassilo Horn <tassilo@member.fsf.org> 82010-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
144static int make_hdr (int, int, unsigned, unsigned, unsigned, 144static int make_hdr (int, int, const char *, const char *);
145 const char *, const char *);
146static int copy_text_and_data (int, int); 145static int copy_text_and_data (int, int);
147static int copy_sym (int, int, const char *, const char *); 146static int copy_sym (int, int, const char *, const char *);
148static void mark_x (const char *); 147static void mark_x (const char *);