comparison src/lstream.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 9c7decce1d05
children 9f70af3ac939
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
298 free_managed_lcrecord (Vlstream_free_list[i], val); 298 free_managed_lcrecord (Vlstream_free_list[i], val);
299 return; 299 return;
300 } 300 }
301 } 301 }
302 302
303 abort (); 303 ABORT ();
304 } 304 }
305 305
306 #define Lstream_internal_error(reason, lstr) \ 306 #define Lstream_internal_error(reason, lstr) \
307 signal_error (Qinternal_error, reason, wrap_lstream (lstr)) 307 signal_error (Qinternal_error, reason, wrap_lstream (lstr))
308 308
369 occur, for example, if this stream does non-blocking I/O; 369 occur, for example, if this stream does non-blocking I/O;
370 the attempt to write the data might have resulted in an 370 the attempt to write the data might have resulted in an
371 EWOULDBLOCK error. */ 371 EWOULDBLOCK error. */
372 break; 372 break;
373 else if (num_written > size) 373 else if (num_written > size)
374 abort (); 374 ABORT ();
375 else if (num_written > 0) 375 else if (num_written > 0)
376 { 376 {
377 data += num_written; 377 data += num_written;
378 size -= num_written; 378 size -= num_written;
379 } 379 }
1644 Charbpos bmin, bmax; 1644 Charbpos bmin, bmax;
1645 int reading = !strcmp (mode, "r"); 1645 int reading = !strcmp (mode, "r");
1646 1646
1647 /* Make sure the luser didn't pass "w" in. */ 1647 /* Make sure the luser didn't pass "w" in. */
1648 if (!strcmp (mode, "w")) 1648 if (!strcmp (mode, "w"))
1649 abort (); 1649 ABORT ();
1650 1650
1651 if (flags & LSTR_IGNORE_ACCESSIBLE) 1651 if (flags & LSTR_IGNORE_ACCESSIBLE)
1652 { 1652 {
1653 bmin = BUF_BEG (buf); 1653 bmin = BUF_BEG (buf);
1654 bmax = BUF_Z (buf); 1654 bmax = BUF_Z (buf);