comparison src/console-stream.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 91671c428d8b
children 141c2920ea48
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
225 is a few changes to the redisplay critical-section handling. */ 225 is a few changes to the redisplay critical-section handling. */
226 226
227 static void 227 static void
228 stream_window_output_begin (struct window *UNUSED (w)) 228 stream_window_output_begin (struct window *UNUSED (w))
229 { 229 {
230 abort (); 230 ABORT ();
231 } 231 }
232 232
233 static void 233 static void
234 stream_window_output_end (struct window *UNUSED (w)) 234 stream_window_output_end (struct window *UNUSED (w))
235 { 235 {
236 abort (); 236 ABORT ();
237 } 237 }
238 238
239 static void 239 static void
240 stream_frame_output_begin (struct frame *UNUSED (f)) 240 stream_frame_output_begin (struct frame *UNUSED (f))
241 { 241 {
242 abort (); 242 ABORT ();
243 } 243 }
244 244
245 static void 245 static void
246 stream_frame_output_end (struct frame *UNUSED (f)) 246 stream_frame_output_end (struct frame *UNUSED (f))
247 { 247 {
248 abort (); 248 ABORT ();
249 } 249 }
250 250
251 static void 251 static void
252 stream_output_display_block (struct window *UNUSED (w), 252 stream_output_display_block (struct window *UNUSED (w),
253 struct display_line *UNUSED (dl), 253 struct display_line *UNUSED (dl),
255 int UNUSED (end), int UNUSED (start_pixpos), 255 int UNUSED (end), int UNUSED (start_pixpos),
256 int UNUSED (cursor_start), 256 int UNUSED (cursor_start),
257 int UNUSED (cursor_width), 257 int UNUSED (cursor_width),
258 int UNUSED (cursor_height)) 258 int UNUSED (cursor_height))
259 { 259 {
260 abort (); 260 ABORT ();
261 } 261 }
262 262
263 static void 263 static void
264 stream_clear_region (Lisp_Object UNUSED (window), struct device* UNUSED (d), 264 stream_clear_region (Lisp_Object UNUSED (window), struct device* UNUSED (d),
265 struct frame *UNUSED (f), face_index UNUSED (findex), 265 struct frame *UNUSED (f), face_index UNUSED (findex),
266 int UNUSED (x), int UNUSED (y), int UNUSED (width), 266 int UNUSED (x), int UNUSED (y), int UNUSED (width),
267 int UNUSED (height), Lisp_Object UNUSED (fcolor), 267 int UNUSED (height), Lisp_Object UNUSED (fcolor),
268 Lisp_Object UNUSED (bcolor), 268 Lisp_Object UNUSED (bcolor),
269 Lisp_Object UNUSED (background_pixmap)) 269 Lisp_Object UNUSED (background_pixmap))
270 { 270 {
271 abort (); 271 ABORT ();
272 } 272 }
273 273
274 static int 274 static int
275 stream_flash (struct device *UNUSED (d)) 275 stream_flash (struct device *UNUSED (d))
276 { 276 {