comparison src/rangetab.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 b3315b0c8558
children de9952d2ed18
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
73 return Qstart_open_end_open; 73 return Qstart_open_end_open;
74 case RANGE_START_OPEN_END_CLOSED: 74 case RANGE_START_OPEN_END_CLOSED:
75 return Qstart_open_end_closed; 75 return Qstart_open_end_closed;
76 } 76 }
77 77
78 abort (); 78 ABORT ();
79 return Qnil; 79 return Qnil;
80 } 80 }
81 81
82 /* We use a sorted array of ranges. 82 /* We use a sorted array of ranges.
83 83
117 { 117 {
118 case RANGE_START_CLOSED_END_OPEN: so = 0, ec = 0; break; 118 case RANGE_START_CLOSED_END_OPEN: so = 0, ec = 0; break;
119 case RANGE_START_CLOSED_END_CLOSED: so = 0, ec = 1; break; 119 case RANGE_START_CLOSED_END_CLOSED: so = 0, ec = 1; break;
120 case RANGE_START_OPEN_END_OPEN: so = 1, ec = 0; break; 120 case RANGE_START_OPEN_END_OPEN: so = 1, ec = 0; break;
121 case RANGE_START_OPEN_END_CLOSED: so = 1; ec = 1; break; 121 case RANGE_START_OPEN_END_CLOSED: so = 1; ec = 1; break;
122 default: abort (); so = 0, ec = 0; break; 122 default: ABORT (); so = 0, ec = 0; break;
123 } 123 }
124 write_fmt_string (printcharfun, "%c%ld %ld%c ", 124 write_fmt_string (printcharfun, "%c%ld %ld%c ",
125 print_readably ? '(' : so ? '(' : '[', 125 print_readably ? '(' : so ? '(' : '[',
126 (long) (rte->first - so), 126 (long) (rte->first - so),
127 (long) (rte->last - ec), 127 (long) (rte->last - ec),
650 PROPERTY_LIST_LOOP_3 (key, value, plist) 650 PROPERTY_LIST_LOOP_3 (key, value, plist)
651 { 651 {
652 if (EQ (key, Qtype)) type = value; 652 if (EQ (key, Qtype)) type = value;
653 else if (EQ (key, Qdata)) data = value; 653 else if (EQ (key, Qdata)) data = value;
654 else 654 else
655 abort (); 655 ABORT ();
656 } 656 }
657 657
658 rangetab = Fmake_range_table (type); 658 rangetab = Fmake_range_table (type);
659 659
660 { 660 {