comparison src/text.h @ 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 902d5bd9b75c
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
1420 ... from raw internal-format data in the specified format that is 1420 ... from raw internal-format data in the specified format that is
1421 "null-terminated" (the meaning of this depends on the nature of 1421 "null-terminated" (the meaning of this depends on the nature of
1422 the specific format). 1422 the specific format).
1423 void eicpy_ascii (Eistring *eistr, const Ascbyte *ascstr); 1423 void eicpy_ascii (Eistring *eistr, const Ascbyte *ascstr);
1424 ... from an ASCII null-terminated string. Non-ASCII characters in 1424 ... from an ASCII null-terminated string. Non-ASCII characters in
1425 the string are *ILLEGAL* (read abort() with error-checking defined). 1425 the string are *ILLEGAL* (read ABORT() with error-checking defined).
1426 void eicpy_ascii_len (Eistring *eistr, const Ascbyte *ascstr, len); 1426 void eicpy_ascii_len (Eistring *eistr, const Ascbyte *ascstr, len);
1427 ... from an ASCII string, with length specified. Non-ASCII characters 1427 ... from an ASCII string, with length specified. Non-ASCII characters
1428 in the string are *ILLEGAL* (read abort() with error-checking defined). 1428 in the string are *ILLEGAL* (read ABORT() with error-checking defined).
1429 void eicpy_ext (Eistring *eistr, const Extbyte *extdata, 1429 void eicpy_ext (Eistring *eistr, const Extbyte *extdata,
1430 Lisp_Object codesys); 1430 Lisp_Object codesys);
1431 ... from external null-terminated data, with coding system specified. 1431 ... from external null-terminated data, with coding system specified.
1432 void eicpy_ext_len (Eistring *eistr, const Extbyte *extdata, 1432 void eicpy_ext_len (Eistring *eistr, const Extbyte *extdata,
1433 Bytecount extlen, Lisp_Object codesys); 1433 Bytecount extlen, Lisp_Object codesys);
1563 1563
1564 void eicat_ei (Eistring *eistr, Eistring *eistr2); 1564 void eicat_ei (Eistring *eistr, Eistring *eistr2);
1565 ... from another Eistring. 1565 ... from another Eistring.
1566 void eicat_ascii (Eistring *eistr, Ascbyte *ascstr); 1566 void eicat_ascii (Eistring *eistr, Ascbyte *ascstr);
1567 ... from an ASCII null-terminated string. Non-ASCII characters in 1567 ... from an ASCII null-terminated string. Non-ASCII characters in
1568 the string are *ILLEGAL* (read abort() with error-checking defined). 1568 the string are *ILLEGAL* (read ABORT() with error-checking defined).
1569 void eicat_raw (ei, const Ibyte *data, Bytecount len); 1569 void eicat_raw (ei, const Ibyte *data, Bytecount len);
1570 ... from raw internal-format data in the default internal format. 1570 ... from raw internal-format data in the default internal format.
1571 void eicat_rawz (ei, const Ibyte *data); 1571 void eicat_rawz (ei, const Ibyte *data);
1572 ... from raw internal-format data in the default internal format 1572 ... from raw internal-format data in the default internal format
1573 that is "null-terminated" (the meaning of this depends on the nature 1573 that is "null-terminated" (the meaning of this depends on the nature
1593 Bytecount len, Charcount charlen, Eistring *eistr2); 1593 Bytecount len, Charcount charlen, Eistring *eistr2);
1594 ... with another Eistring. 1594 ... with another Eistring.
1595 void eisub_ascii (Eistring *eistr, Bytecount off, Charcount charoff, 1595 void eisub_ascii (Eistring *eistr, Bytecount off, Charcount charoff,
1596 Bytecount len, Charcount charlen, Ascbyte *ascstr); 1596 Bytecount len, Charcount charlen, Ascbyte *ascstr);
1597 ... with an ASCII null-terminated string. Non-ASCII characters in 1597 ... with an ASCII null-terminated string. Non-ASCII characters in
1598 the string are *ILLEGAL* (read abort() with error-checking defined). 1598 the string are *ILLEGAL* (read ABORT() with error-checking defined).
1599 void eisub_ch (Eistring *eistr, Bytecount off, Charcount charoff, 1599 void eisub_ch (Eistring *eistr, Bytecount off, Charcount charoff,
1600 Bytecount len, Charcount charlen, Ichar ch); 1600 Bytecount len, Charcount charlen, Ichar ch);
1601 ... with an Ichar. 1601 ... with an Ichar.
1602 1602
1603 void eidel (Eistring *eistr, Bytecount off, Charcount charoff, 1603 void eidel (Eistring *eistr, Bytecount off, Charcount charoff,