diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-04-30 13:31:17 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-04-30 13:31:17 +0300 |
| commit | 8db90b73941f09a17c41069828c64b91eca790d6 (patch) | |
| tree | 85c45053563b0662294fea78e88bb0a27febbbd7 /src | |
| parent | 330d880c3acc6b9e072b75af68a6332120de4457 (diff) | |
| download | emacs-8db90b73941f09a17c41069828c64b91eca790d6.tar.gz | |
Adapt the MSDOS build to latest changes.
msdos/inttypes.h: New file.
msdos/sed2v2.inp (HAVE_DECL_STRTOULL, HAVE_DECL_STRTOUMAX)
(HAVE_STRTOULL, HAVE_STRTOULL): Define to 1.
src/sedlibmk.inp (BUILT_SOURCES): Edit out inttypes.h.
src/sed1v2.inp (CPPFLAGS): Edit to "-I../msdos".
Add ../msdos/inttypes.h to prerequisites of lread.o.
src/dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)'
rather than `XVECTOR (FOO)->size'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/dosfns.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e2819df6444..7b54b1e521c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-04-30 Eli Zaretskii <eliz@gnu.org> + * dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)' + rather than `XVECTOR (FOO)->size'. + * process.c: Remove HAVE_INTTYPES_H condition from inclusion of inttypes.h, as a gnulib replacement is used if it not available in system headers. diff --git a/src/dosfns.c b/src/dosfns.c index 3b9b2dbc038..e903ef20af0 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -62,7 +62,7 @@ REGISTERS should be a vector produced by `make-register' and CHECK_NUMBER (interrupt); no = (unsigned long) XINT (interrupt); CHECK_VECTOR (registers); - if (no < 0 || no > 0xff || XVECTOR (registers)-> size != 8) + if (no < 0 || no > 0xff || ASIZE (registers) != 8) return Qnil; for (i = 0; i < 8; i++) CHECK_NUMBER (XVECTOR (registers)->contents[i]); @@ -102,7 +102,7 @@ Return the updated VECTOR. */) CHECK_NUMBER (address); offs = (unsigned long) XINT (address); CHECK_VECTOR (vector); - len = XVECTOR (vector)-> size; + len = ASIZE (vector); if (len < 1 || len > 2048 || offs < 0 || offs > 0xfffff - len) return Qnil; buf = alloca (len); @@ -125,7 +125,7 @@ DEFUN ("msdos-memput", Fdos_memput, Sdos_memput, 2, 2, 0, CHECK_NUMBER (address); offs = (unsigned long) XINT (address); CHECK_VECTOR (vector); - len = XVECTOR (vector)-> size; + len = ASIZE (vector); if (len < 1 || len > 2048 || offs < 0 || offs > 0xfffff - len) return Qnil; buf = alloca (len); |