diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-07-14 13:08:14 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-07-14 13:08:14 +0300 |
| commit | 5a1131d937c324c070173482a8d7d47e3b3c79b0 (patch) | |
| tree | 570554eddbff849902f0412f94e2f99c8dc949df /src/gmalloc.c | |
| parent | 044080727ca76118afbd1cc35f85dbef7582030e (diff) | |
| parent | b5cf7fc45c625b312ab88fb3fa13eef2f25acbce (diff) | |
| download | emacs-5a1131d937c324c070173482a8d7d47e3b3c79b0.tar.gz | |
Adapt the MS-DOS build to the latest configury changes.
msdos/sed1v2.inp: In the recipe for $(leimdir)/leim-list.el, edit the
prerequisites to be "temacs$(EXEEXT) $(BOOTSTRAPEMACS)", to avoid
the need to rebuild $(bootstrap_exe), which requires a Unixy shell
via lisp/Makefile.in's "update-subdirs" command.
msdos/sedlibmk.inp (am_libgnu_a_OBJECTS): Adjust the removal of
careadlinkat.$(OBJEXT) to the changes in lib/Makefile.in.
msdos/sed2v2.inp (DATA_START, GC_SETJMP_WORKS, HAVE_MENUS)
(HAVE_MOUSE): Edit for DJGPP, according to what was previously
done on src/s/msdos.h.
msdos/gmalloc.c (GMALLOC_INHIBIT_VALLOC): Don't reference.
src/s/msdos.h (BSD_SYSTEM, DATA_START, GC_SETJMP_WORKS, HAVE_MOUSE)
(HAVE_MENUS): Don't define, defined by editing config.in with
msdos/sed2v2.inp.
(GMALLOC_INHIBIT_VALLOC): Don't define.
(MODE_LINE_BINARY_TEXT): Remove, not used anymore.
Diffstat (limited to 'src/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index 3739214bc46..78d6934755b 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -1687,11 +1687,6 @@ Fifth Floor, Boston, MA 02110-1301, USA. The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ -/* Emacs defines GMALLOC_INHIBIT_VALLOC to avoid this definition - on MSDOS, where it conflicts with a system header file. */ - -#ifndef GMALLOC_INHIBIT_VALLOC - /* Allocate SIZE bytes on a page boundary. */ extern void *valloc (size_t); @@ -1712,8 +1707,6 @@ valloc (size_t size) return memalign (pagesize, size); } -#endif /* Not ELIDE_VALLOC. */ - #ifdef GC_MCHECK /* Standard debugging hooks for `malloc'. |