Mercurial > hg > xemacs-beta

comparison src/intl-win32.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 a48989ca6db3
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
1714 case MULTIBYTE_USER_DEFAULT: 1714 case MULTIBYTE_USER_DEFAULT:
1715 locale = GetUserDefaultLCID (); break; 1715 locale = GetUserDefaultLCID (); break;
1716 case MULTIBYTE_SYSTEM_DEFAULT: 1716 case MULTIBYTE_SYSTEM_DEFAULT:
1717 locale = GetSystemDefaultLCID (); break; 1717 locale = GetSystemDefaultLCID (); break;
1718 default: 1718 default:
1719 abort (); locale = 0; 1719 ABORT (); locale = 0;
1720 } 1720 }
1721 1721
1722 switch (data->cp_type) 1722 switch (data->cp_type)
1723 { 1723 {
1724 case MULTIBYTE_ANSI: 1724 case MULTIBYTE_ANSI:
1750 invalid_operation ("Unable to determine Mac code page for locale", 1750 invalid_operation ("Unable to determine Mac code page for locale",
1751 lcid_to_locale (locale)); 1751 lcid_to_locale (locale));
1752 return 0; 1752 return 0;
1753 #endif 1753 #endif
1754 default: 1754 default:
1755 abort (); return 0; 1755 ABORT (); return 0;
1756 } 1756 }
1757 #else /* not MULE */ 1757 #else /* not MULE */
1758 return CP_ACP; 1758 return CP_ACP;
1759 #endif 1759 #endif
1760 } 1760 }
1823 { 1823 {
1824 case MULTIBYTE_ANSI: return Qansi; 1824 case MULTIBYTE_ANSI: return Qansi;
1825 case MULTIBYTE_OEM: return Qoem; 1825 case MULTIBYTE_OEM: return Qoem;
1826 case MULTIBYTE_EBCDIC: return Qebcdic; 1826 case MULTIBYTE_EBCDIC: return Qebcdic;
1827 case MULTIBYTE_MAC: return Qmac; 1827 case MULTIBYTE_MAC: return Qmac;
1828 default: abort (); 1828 default: ABORT ();
1829 } 1829 }
1830 } 1830 }
1831 else if (EQ (prop, Qlocale)) 1831 else if (EQ (prop, Qlocale))
1832 { 1832 {
1833 switch (data->locale_type) 1833 switch (data->locale_type)
1838 case MULTIBYTE_SPECIFIED_LOCALE: 1838 case MULTIBYTE_SPECIFIED_LOCALE:
1839 return lcid_to_locale_mule_or_no (data->locale); 1839 return lcid_to_locale_mule_or_no (data->locale);
1840 1840
1841 case MULTIBYTE_SPECIFIED_CODE_PAGE: 1841 case MULTIBYTE_SPECIFIED_CODE_PAGE:
1842 return Qnil; 1842 return Qnil;
1843 default: abort (); 1843 default: ABORT ();
1844 } 1844 }
1845 } 1845 }
1846 1846
1847 return Qunbound; 1847 return Qunbound;
1848 } 1848 }
2144 unsigned_char_dynarr *UNUSED (dst), Bytecount n) 2144 unsigned_char_dynarr *UNUSED (dst), Bytecount n)
2145 { 2145 {
2146 Bytecount orign = n; 2146 Bytecount orign = n;
2147 /* should never be called; is preprocessed away in the 2147 /* should never be called; is preprocessed away in the
2148 canonicalize method */ 2148 canonicalize method */
2149 abort (); 2149 ABORT ();
2150 return orign; 2150 return orign;
2151 } 2151 }
2152 2152
2153 static void 2153 static void
2154 mswindows_multibyte_init (Lisp_Object codesys) 2154 mswindows_multibyte_init (Lisp_Object codesys)