Mercurial > hg > xemacs-beta

comparison src/chartab.c @ 2500:3d8143fc88e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 2eed1f34d39d
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
193 static Lisp_Object 193 static Lisp_Object
194 char_table_type_to_symbol (enum char_table_type type) 194 char_table_type_to_symbol (enum char_table_type type)
195 { 195 {
196 switch (type) 196 switch (type)
197 { 197 {
198 default: abort(); 198 default: ABORT();
199 case CHAR_TABLE_TYPE_GENERIC: return Qgeneric; 199 case CHAR_TABLE_TYPE_GENERIC: return Qgeneric;
200 case CHAR_TABLE_TYPE_SYNTAX: return Qsyntax; 200 case CHAR_TABLE_TYPE_SYNTAX: return Qsyntax;
201 case CHAR_TABLE_TYPE_DISPLAY: return Qdisplay; 201 case CHAR_TABLE_TYPE_DISPLAY: return Qdisplay;
202 case CHAR_TABLE_TYPE_CHAR: return Qchar; 202 case CHAR_TABLE_TYPE_CHAR: return Qchar;
203 #ifdef MULE 203 #ifdef MULE
259 break; 259 break;
260 case CHARSET_TYPE_96X96: 260 case CHARSET_TYPE_96X96:
261 check_int_range (outrange->row, 32, 127); 261 check_int_range (outrange->row, 32, 127);
262 break; 262 break;
263 default: 263 default:
264 abort (); 264 ABORT ();
265 } 265 }
266 } 266 }
267 else 267 else
268 { 268 {
269 if (!CHARSETP (range) && !SYMBOLP (range)) 269 if (!CHARSETP (range) && !SYMBOLP (range))
292 make_int (range->row)); 292 make_int (range->row));
293 #endif 293 #endif
294 case CHARTAB_RANGE_CHAR: 294 case CHARTAB_RANGE_CHAR:
295 return make_char (range->ch); 295 return make_char (range->ch);
296 default: 296 default:
297 abort (); 297 ABORT ();
298 } 298 }
299 return Qnil; /* not reached */ 299 return Qnil; /* not reached */
300 } 300 }
301 301
302 struct ptemap 302 struct ptemap
512 case CHAR_TABLE_TYPE_SYNTAX: 512 case CHAR_TABLE_TYPE_SYNTAX:
513 def = make_int (Sinherit); 513 def = make_int (Sinherit);
514 break; 514 break;
515 515
516 default: 516 default:
517 abort (); 517 ABORT ();
518 def = Qnil; 518 def = Qnil;
519 break; 519 break;
520 } 520 }
521 521
522 /* Avoid doubly updating the syntax table by setting the default ourselves, 522 /* Avoid doubly updating the syntax table by setting the default ourselves,
875 break; 875 break;
876 } 876 }
877 #endif /* not MULE */ 877 #endif /* not MULE */
878 878
879 default: 879 default:
880 abort (); 880 ABORT ();
881 } 881 }
882 882
883 if (UNBOUNDP (retval)) 883 if (UNBOUNDP (retval))
884 return ct->default_; 884 return ct->default_;
885 return retval; 885 return retval;
970 return CHAR_OR_CHAR_INTP (value); 970 return CHAR_OR_CHAR_INTP (value);
971 CHECK_CHAR_COERCE_INT (value); 971 CHECK_CHAR_COERCE_INT (value);
972 break; 972 break;
973 973
974 default: 974 default:
975 abort (); 975 ABORT ();
976 } 976 }
977 977
978 return 0; /* not (usually) reached */ 978 return 0; /* not (usually) reached */
979 } 979 }
980 980
1424 else 1424 else
1425 return 0; 1425 return 0;
1426 } 1426 }
1427 1427
1428 default: 1428 default:
1429 abort (); 1429 ABORT ();
1430 } 1430 }
1431 1431
1432 return 0; 1432 return 0;
1433 } 1433 }
1434 1434
1559 1559
1560 for (i = first; i <= last; i++) 1560 for (i = first; i <= last; i++)
1561 Fput_char_table (make_char (i), val, chartab); 1561 Fput_char_table (make_char (i), val, chartab);
1562 } 1562 }
1563 else 1563 else
1564 abort (); 1564 ABORT ();
1565 } 1565 }
1566 else 1566 else
1567 Fput_char_table (range, val, chartab); 1567 Fput_char_table (range, val, chartab);
1568 } 1568 }
1569 1569