comparison src/malloc.c @ 2500:3d8143fc88e1

[xemacs-hg @ 2005-01-24 23:33:30 by ben] get working with VC7 config.inc.samp: Declare OPTIONAL_LIBRARY_DIR as root of library directories. Redo all graphics library defaults to mirror the versions and directories in the current binary aux distribution on xemacs web site. Enable TIFF and COMPFACE by default since you can now compile with them and binary libs are provided. xemacs.mak: Put our own directories first in case of conflict (e.g. config.h in compface). xemacs.mak: Use MSVCRT to avoid link problems. s/windowsnt.h: bytecode.c, print.c: Add casts to avoid warning. compiler.h: Add MSC_VERSION and include definitions of DOESNT_RETURN and friends here, like for GCC. Need different definitions for VC7 and VC6. s/windowsnt.h: Remove stuff moved to compiler.h. Disable warning 4646 ("function declared with __declspec(noreturn) has non-void return type") on VC7 since lots of Lisp primitives trigger this and there is no easy way to kludge around the warning. glyphs-eimage.c: Some really nasty hacks to allow TIFF and JPEG to both be compiled. #### The better solution is to move the TIFF and JPEG code to different files. glyphs-msw.c: Define __STDC__ to avoid problems with compface.h. intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, syswindows.h: Those wankers at Microsoft cannot leave well enough alone. Various functions change parameter types semi-randomly between VC6 and VC7, so we need to include our own versions that can handle both kinds with appropriate casting. EmacsFrame.c, EmacsShell-sub.c, EmacsShell.c, alloc.c, alloca.c, buffer.c, bytecode.c, charset.h, chartab.c, cm.c, console-stream.c, console.c, data.c, debug.h, device-msw.c, device-tty.c, device-x.c, doprnt.c, dumper.c, dynarr.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, free-hook.c, gccache-gtk.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, glyphs.c, gtk-glue.c, gutter.c, input-method-xlib.c, insdel.c, intl-win32.c, keymap.c, lisp.h, lread.c, lstream.c, macros.c, malloc.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, mule-coding.c, native-gtk-toolbar.c, number.c, objects-msw.c, objects.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, regex.c, scrollbar-gtk.c, scrollbar-x.c, search.c, select-x.c, signal.c, specifier.c, specifier.h, strftime.c, sunplay.c, symbols.c, sysdep.c, sysproc.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, ui-gtk.c, unexnt.c, unicode.c, win32.c, window.c, xgccache.c, s/windowsnt.h: abort() -> ABORT(). Eliminate preprocessor games with abort() since it creates huge problems in VC7, solvable only by including massive amounts of files in every compile (and not worth it).
author ben
date Mon, 24 Jan 2005 23:34:34 +0000
parents 5c7bc4e019e6
children facf3239ba30
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
523 /* and bomb out on the NEXT allocate of this size block */ 523 /* and bomb out on the NEXT allocate of this size block */
524 if (p -> mh_alloc != ISFREE || p -> mh_index != nunits) 524 if (p -> mh_alloc != ISFREE || p -> mh_index != nunits)
525 #ifdef rcheck 525 #ifdef rcheck
526 botch ("block on free list clobbered"); 526 botch ("block on free list clobbered");
527 #else /* not rcheck */ 527 #else /* not rcheck */
528 abort (); 528 ABORT ();
529 #endif /* not rcheck */ 529 #endif /* not rcheck */
530 530
531 /* Fill in the info, and if range checking, set up the magic numbers */ 531 /* Fill in the info, and if range checking, set up the magic numbers */
532 p -> mh_alloc = ISALLOC; 532 p -> mh_alloc = ISALLOC;
533 #ifdef rcheck 533 #ifdef rcheck
567 p = (struct mhead *) (ap - ((sizeof (*p) + 7) & ~7)); 567 p = (struct mhead *) (ap - ((sizeof (*p) + 7) & ~7));
568 } 568 }
569 569
570 #ifndef rcheck 570 #ifndef rcheck
571 if (p -> mh_alloc != ISALLOC) 571 if (p -> mh_alloc != ISALLOC)
572 abort (); 572 ABORT ();
573 573
574 #else /* rcheck */ 574 #else /* rcheck */
575 if (p -> mh_alloc != ISALLOC) 575 if (p -> mh_alloc != ISALLOC)
576 { 576 {
577 if (p -> mh_alloc == ISFREE) 577 if (p -> mh_alloc == ISFREE)