comparison src/mule-coding.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 ecf1ebac70d8
children 9f70af3ac939
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
1245 break; 1245 break;
1246 case CHARSET_TYPE_96X96: 1246 case CHARSET_TYPE_96X96:
1247 chars = 96; dim = 2; 1247 chars = 96; dim = 2;
1248 break; 1248 break;
1249 default: 1249 default:
1250 abort (); chars = 0; dim = 0; 1250 ABORT (); chars = 0; dim = 0;
1251 } 1251 }
1252 1252
1253 charset = Fmake_charset (Qunbound, Qnil, 1253 charset = Fmake_charset (Qunbound, Qnil,
1254 nconc2 (list6 (Qfinal, make_char (final), 1254 nconc2 (list6 (Qfinal, make_char (final),
1255 Qchars, make_int (chars), 1255 Qchars, make_int (chars),
1550 reg = (iso->esc - ISO_ESC_2_4_8) & 3; 1550 reg = (iso->esc - ISO_ESC_2_4_8) & 3;
1551 } 1551 }
1552 else 1552 else
1553 { 1553 {
1554 /* Can this ever be reached? -slb */ 1554 /* Can this ever be reached? -slb */
1555 abort (); 1555 ABORT ();
1556 goto error; 1556 goto error;
1557 } 1557 }
1558 1558
1559 if (c < '0' || c > '~' || 1559 if (c < '0' || c > '~' ||
1560 (c > 0x5F && (type == CHARSET_TYPE_94X94 || 1560 (c > 0x5F && (type == CHARSET_TYPE_94X94 ||
1599 return 1; 1599 return 1;
1600 1600
1601 designated: 1601 designated:
1602 if (NILP (cs) && check_invalid_charsets) 1602 if (NILP (cs) && check_invalid_charsets)
1603 { 1603 {
1604 abort (); 1604 ABORT ();
1605 /* #### This should never happen now that we automatically create 1605 /* #### This should never happen now that we automatically create
1606 temporary charsets as necessary. We should probably remove 1606 temporary charsets as necessary. We should probably remove
1607 this code. --ben */ 1607 this code. --ben */
1608 iso->invalid_designated[reg] = 1; 1608 iso->invalid_designated[reg] = 1;
1609 iso->charset[reg] = Vcharset_ascii; 1609 iso->charset[reg] = Vcharset_ascii;
2239 half = 1; 2239 half = 1;
2240 } 2240 }
2241 break; 2241 break;
2242 2242
2243 default: 2243 default:
2244 abort (); 2244 ABORT ();
2245 } 2245 }
2246 } 2246 }
2247 char_boundary = 0; 2247 char_boundary = 0;
2248 } 2248 }
2249 else 2249 else
2333 ch = c; 2333 ch = c;
2334 char_boundary = 0; 2334 char_boundary = 0;
2335 } 2335 }
2336 break; 2336 break;
2337 default: 2337 default:
2338 abort (); 2338 ABORT ();
2339 } 2339 }
2340 } 2340 }
2341 } 2341 }
2342 } 2342 }
2343 2343