Mercurial > hg > xemacs-beta
comparison src/symbols.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 | ab71ad6ff3dd |
children | 6fa9919a9a0b |
comparison
equal
deleted
inserted
replaced
2499:4c5ee4d2e921 | 2500:3d8143fc88e1 |
---|---|
1111 | 1111 |
1112 case SYMVAL_UNBOUND_MARKER: | 1112 case SYMVAL_UNBOUND_MARKER: |
1113 return valcontents; | 1113 return valcontents; |
1114 | 1114 |
1115 default: | 1115 default: |
1116 abort (); | 1116 ABORT (); |
1117 } | 1117 } |
1118 return Qnil; /* suppress compiler warning */ | 1118 return Qnil; /* suppress compiler warning */ |
1119 } | 1119 } |
1120 | 1120 |
1121 /* Set the value of default-buffer-local variable SYM to VALUE. */ | 1121 /* Set the value of default-buffer-local variable SYM to VALUE. */ |
1287 - (char *) &console_local_flags))) | 1287 - (char *) &console_local_flags))) |
1288 = newval; | 1288 = newval; |
1289 return; | 1289 return; |
1290 | 1290 |
1291 default: | 1291 default: |
1292 abort (); | 1292 ABORT (); |
1293 } | 1293 } |
1294 } | 1294 } |
1295 } | 1295 } |
1296 | 1296 |
1297 /* Given a per-buffer variable SYMBOL and its raw value-cell contents | 1297 /* Given a per-buffer variable SYMBOL and its raw value-cell contents |
1912 valcontents = bfwd->current_value; | 1912 valcontents = bfwd->current_value; |
1913 } | 1913 } |
1914 break; | 1914 break; |
1915 } | 1915 } |
1916 default: | 1916 default: |
1917 abort (); | 1917 ABORT (); |
1918 } | 1918 } |
1919 store_symval_forwarding (symbol, valcontents, newval); | 1919 store_symval_forwarding (symbol, valcontents, newval); |
1920 | 1920 |
1921 return newval; | 1921 return newval; |
1922 } | 1922 } |
2179 XSYMBOL_VALUE_BUFFER_LOCAL (valcontents)->magic.type = | 2179 XSYMBOL_VALUE_BUFFER_LOCAL (valcontents)->magic.type = |
2180 SYMVAL_BUFFER_LOCAL; | 2180 SYMVAL_BUFFER_LOCAL; |
2181 return variable; | 2181 return variable; |
2182 | 2182 |
2183 default: | 2183 default: |
2184 abort (); | 2184 ABORT (); |
2185 } | 2185 } |
2186 } | 2186 } |
2187 | 2187 |
2188 { | 2188 { |
2189 struct symbol_value_buffer_local *bfwd | 2189 struct symbol_value_buffer_local *bfwd |
2288 else | 2288 else |
2289 goto already_local_to_some_other_buffer; | 2289 goto already_local_to_some_other_buffer; |
2290 } | 2290 } |
2291 | 2291 |
2292 default: | 2292 default: |
2293 abort (); | 2293 ABORT (); |
2294 } | 2294 } |
2295 } | 2295 } |
2296 | 2296 |
2297 /* Make sure variable is set up to hold per-buffer values */ | 2297 /* Make sure variable is set up to hold per-buffer values */ |
2298 bfwd = alloc_lcrecord_type (struct symbol_value_buffer_local, | 2298 bfwd = alloc_lcrecord_type (struct symbol_value_buffer_local, |
2362 case SYMVAL_UNBOUND_MARKER: | 2362 case SYMVAL_UNBOUND_MARKER: |
2363 case SYMVAL_CURRENT_BUFFER_FORWARD: | 2363 case SYMVAL_CURRENT_BUFFER_FORWARD: |
2364 break; | 2364 break; |
2365 | 2365 |
2366 default: | 2366 default: |
2367 abort (); | 2367 ABORT (); |
2368 } | 2368 } |
2369 } | 2369 } |
2370 | 2370 |
2371 return variable; | 2371 return variable; |
2372 } | 2372 } |
2680 case SYMVAL_SELECTED_CONSOLE_FORWARD: return Qselected_console; | 2680 case SYMVAL_SELECTED_CONSOLE_FORWARD: return Qselected_console; |
2681 case SYMVAL_CONST_SELECTED_CONSOLE_FORWARD: return Qconst_selected_console; | 2681 case SYMVAL_CONST_SELECTED_CONSOLE_FORWARD: return Qconst_selected_console; |
2682 case SYMVAL_UNBOUND_MARKER: return Qnil; | 2682 case SYMVAL_UNBOUND_MARKER: return Qnil; |
2683 | 2683 |
2684 default: | 2684 default: |
2685 abort (); return Qnil; | 2685 ABORT (); return Qnil; |
2686 } | 2686 } |
2687 } | 2687 } |
2688 | 2688 |
2689 | 2689 |
2690 DEFUN ("local-variable-p", Flocal_variable_p, 2, 3, 0, /* | 2690 DEFUN ("local-variable-p", Flocal_variable_p, 2, 3, 0, /* |
2910 if (EQ (funsym, Qmake_variable_buffer_local) | 2910 if (EQ (funsym, Qmake_variable_buffer_local) |
2911 || EQ (funsym, Qmake_local_variable)) | 2911 || EQ (funsym, Qmake_local_variable)) |
2912 return MAGIC_HANDLER_MAKE_LOCAL; | 2912 return MAGIC_HANDLER_MAKE_LOCAL; |
2913 | 2913 |
2914 if (abort_if_not_found) | 2914 if (abort_if_not_found) |
2915 abort (); | 2915 ABORT (); |
2916 invalid_argument ("Unrecognized symbol-value function", funsym); | 2916 invalid_argument ("Unrecognized symbol-value function", funsym); |
2917 RETURN_NOT_REACHED (MAGIC_HANDLER_MAX); | 2917 RETURN_NOT_REACHED (MAGIC_HANDLER_MAX); |
2918 } | 2918 } |
2919 | 2919 |
2920 static int | 2920 static int |