mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

Fix the MSDOS build broken by latest revisions.

Browse Source 
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.
This commit is contained in:
Eli Zaretskii 2010-10-15 20:42:54 +02:00
parent aa095b2db9
commit c3911ead5d
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
msdos/ChangeLog
View File

@ -1,3 +1,11 @@
2010-10-15 Eli Zaretskii <eliz@gnu.org>
* sed1v2.inp: Use $(..) instead of ${..} in all edit commands.
Needed because of changes in 2010-10-10T14:43:05Z!dann@ics.uci.edu.
* sed6.inp (mkinfodir): Edit to avoid Unix shell-isms. Needed
because of changes in 2010-10-09T18:31:12Z!rgm@gnu.org.
2010-10-10 Dan Nicolaescu <dann@ics.uci.edu>
* sed1v2.inp (PROFILING_LDFLAGS):

8
msdos/sed1v2.inp
View File

@ -131,12 +131,12 @@ s/\.h\.in/.h-in/
/^M_FILE *=/s!@[^@\n]*@!m/intel386.h!
/^S_FILE *=/s!@[^@\n]*@!s/msdos.h!
/^@SET_MAKE@$/s/@SET_MAKE@//
/^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC!
/^.\${libsrc}make-doc/s!>.*$!!
/^.\$(libsrc)\/make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC!
/^.\$(libsrc)\/make-doc/s!>.*$!!
/^[ ]*$/d
/^ if test -f/,/^ fi$/c\
command.com /c if exist .gdbinit rm -f _gdbinit
/^ if test "\${CANNOT_DUMP}" =/,/^ else /d
/^ if test "\$(CANNOT_DUMP)" =/,/^ else /d
/^ fi/d
/^ LC_ALL=C \$(RUN_TEMACS)/i\
stubedit temacs.exe minstack=1024k
@ -152,7 +152,7 @@ s/ || true\; \\$//
/^ if test -f/,/^ fi$/c\
command.com /c if exist .gdbinit rm -f _gdbinit
/^ #/d
/^ cd.*make-docfile/s!$!; cd ${dot}${dot}/src!
/^ cd.*make-docfile/s!$!; cd ../src!
/^ @: /d
/^ -\{0,1\} *ln -/s/ln -f/cp -pf/
/^[ ]touch /s/touch/djecho $@ >/

2
msdos/sed6.inp
View File

@ -43,4 +43,6 @@ export texinputdir := $(srcdir)";"$(TEXINPUTS)
s/^ for file in $(INFO_TARGETS)\; do rm -f.*$/ rm -f $(INFO_TARGETS)/
}
/^mkinfodir *=/s| @.*$|@command.com /c if not exist ..\\..\\info\\emacs mkdir ..\\..\\info|
# arch-tag: defe1001-f35a-47f7-9635-3f5d33ee5e97

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2010-10-15 Eli Zaretskii <eliz@gnu.org>
* unexcoff.c (make_hdr): Fix prototype according to changes in
2010-10-03T13:59:56Z!dann@ics.uci.edu.
* image.c (tiff_load): Cast 3rd argument to avoid compiler warning.
2010-10-15 Tassilo Horn <tassilo@member.fsf.org>

3
src/unexcoff.c
View File

@ -141,8 +141,7 @@ report_error_1 (int fd, const char *msg, int a1, int a2)
error (msg, a1, a2);
}
static int make_hdr (int, int, unsigned, unsigned, unsigned,
const char *, const char *);
static int make_hdr (int, int, const char *, const char *);
static int copy_text_and_data (int, int);
static int copy_sym (int, int, const char *, const char *);
static void mark_x (const char *);