aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-02-19 21:41:00 +0200
committerEli Zaretskii2011-02-19 21:41:00 +0200
commitf601db19da67d24241f17ce15913458ea33599da (patch)
tree907d10c7bd9e5328805f8ed412aede0c6a725c02 /src
parent534e4e80e65e84f3f30567ba1b5727c79158f211 (diff)
downloademacs-f601db19da67d24241f17ce15913458ea33599da.tar.gz
emacs-f601db19da67d24241f17ce15913458ea33599da.zip
Finish fixing the MS-DOS build. Everything builds and works.
src/termcap.c (tputs): Don't declare baud_rate. msdos/sedlibmk.inp (gl_LIBOBJS): Add getloadavg.o. msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS. (BUILT_EMACS): Rename from BUILT-EMACS. msdos/sed6.inp (MAKEINFO): Edit to "makeinfo". (ENVADD): Adjust to MAKEINFO_OPTS. (texinputdir): Don't edit. msdos/sed2v2.inp (my_strftime): Edit to nstrftime. msdos/sed1v2.inp (LIBOBJS): Edit to empty. ($(libsrc)/make-docfile): Two new edits, one each for every invocation of make-docfile. (move-if-change): Fix edit. Remove some unused switches from $(ALL_CFLAGS), to make the GCC command line shorter.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/termcap.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 31e778043f8..2b4d60f9189 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-02-19 Eli Zaretskii <eliz@gnu.org> 12011-02-19 Eli Zaretskii <eliz@gnu.org>
2 2
3 * termcap.c (tputs): Don't declare baud_rate.
4
3 * s/msdos.h (strtold): Define to _strtold. 5 * s/msdos.h (strtold): Define to _strtold.
4 6
52011-02-18 Stefan Monnier <monnier@iro.umontreal.ca> 72011-02-18 Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/src/termcap.c b/src/termcap.c
index 9e64d027640..69ce56d93b3 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -268,7 +268,6 @@ tputs (register char *str, int nlines, register int (*outfun) (/* ??? */))
268 register int padcount = 0; 268 register int padcount = 0;
269 register int speed; 269 register int speed;
270 270
271 extern EMACS_INT baud_rate;
272 speed = baud_rate; 271 speed = baud_rate;
273 /* For quite high speeds, convert to the smaller 272 /* For quite high speeds, convert to the smaller
274 units to avoid overflow. */ 273 units to avoid overflow. */