Mercurial > hg > xemacs-beta
comparison src/search.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 | 3660d327399f |
comparison
equal
deleted
inserted
replaced
2499:4c5ee4d2e921 | 2500:3d8143fc88e1 |
---|---|
1168 RETURN_NOT_REACHED (Qnil); | 1168 RETURN_NOT_REACHED (Qnil); |
1169 } | 1169 } |
1170 if (!EQ (noerror, Qt)) | 1170 if (!EQ (noerror, Qt)) |
1171 { | 1171 { |
1172 if (lim < BUF_BEGV (buf) || lim > BUF_ZV (buf)) | 1172 if (lim < BUF_BEGV (buf) || lim > BUF_ZV (buf)) |
1173 abort (); | 1173 ABORT (); |
1174 BUF_SET_PT (buf, lim); | 1174 BUF_SET_PT (buf, lim); |
1175 return Qnil; | 1175 return Qnil; |
1176 #if 0 /* This would be clean, but maybe programs depend on | 1176 #if 0 /* This would be clean, but maybe programs depend on |
1177 a value of nil here. */ | 1177 a value of nil here. */ |
1178 np = lim; | 1178 np = lim; |
1181 else | 1181 else |
1182 return Qnil; | 1182 return Qnil; |
1183 } | 1183 } |
1184 | 1184 |
1185 if (np < BUF_BEGV (buf) || np > BUF_ZV (buf)) | 1185 if (np < BUF_BEGV (buf) || np > BUF_ZV (buf)) |
1186 abort (); | 1186 ABORT (); |
1187 | 1187 |
1188 BUF_SET_PT (buf, np); | 1188 BUF_SET_PT (buf, np); |
1189 | 1189 |
1190 return make_int (np); | 1190 return make_int (np); |
1191 } | 1191 } |
2936 make_int (search_regs.end[i]), | 2936 make_int (search_regs.end[i]), |
2937 last_thing_searched); | 2937 last_thing_searched); |
2938 } | 2938 } |
2939 else | 2939 else |
2940 /* last_thing_searched must always be Qt, a buffer, or Qnil. */ | 2940 /* last_thing_searched must always be Qt, a buffer, or Qnil. */ |
2941 abort (); | 2941 ABORT (); |
2942 | 2942 |
2943 len = i; | 2943 len = i; |
2944 } | 2944 } |
2945 else | 2945 else |
2946 data[2 * i] = data [2 * i + 1] = Qnil; | 2946 data[2 * i] = data [2 * i + 1] = Qnil; |