Mercurial > hg > xemacs-beta

comparison src/charset.h @ 1111:184461bc8de4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-11-18 06:52:23 by ben] warning fixes, etc. * s/cygwin32.h: -fvtable-thunks is obsolete in GCC 3 and generates warnings. * s/mingw32.h: * s/windowsnt.h: Comment fixes. * emodules.h: Fix warnings from redefining symbols. * eval.c: Fix C++ errors -- no automatic casting between function pointers and void *, function declarations inside of functions not allowed. * event-Xt.c (emacs_Xt_enqueue_focus_event): Warning fixes. * fileio.c (Ffile_truename): Warning fixes. Use LOCAL_TO_WIN32_FILE_FORMAT rather than duplicating it. * glyphs-x.c: Fix style. * intl-auto-encap-win32.c: * intl-auto-encap-win32.h: * intl-encap-win32.c: * intl-encap-win32.c (qxeRegConnectRegistry): * syswindows.h (RegConnectRegistry): DdeCreateStringHandle needs to be manual due to new Cygwin bug. * intl-win32.c: wcslen/wcscmp don't seem to exist under G++ 3, Cygwin. * lisp.h: * lisp-union.h: * lisp-disunion.h: * process-unix.c (unix_send_process): Ugh, C needs volatile and C++ must not have volatile. Remove previous volatile hacks, which don't seem to be working any more. * sheap.c (STATIC_HEAP_SLOP): Try to get a working Cygwin build with old unexec. * sheap.c (more_static_core): No NL's in literals allowed. * symbols.c (Fset): Fix C++ errors. * syswindows.h: Fix Cygwin complaints now that some missing structs have been added. aclocal.m4: Disable shared library modules under Cygwin for the moment, since we need some more tricky coding done and I don't have the time right now. configure.in, configure.usage: code-files.el, loadhist.el: Fix warnings. package-get.el: Fix warnings. NOTE: This was already fixed awhile ago, but reverted by Steve Y. Please be careful. postgresql/Makefile.in.in: Removed. Move common stuff into modues/common/Makefile.common. (Also add extraclean target and a couple of other fixes in that file.) postgresql/configure.ac: Extract out common configure stuff into modules/common/configure-{pre,post}.ac. postgresql/postgresql.c: Fix warning. ldap/Makefile.in.in: Removed. Move common stuff into modues/common/Makefile.common. (Also add extraclean target and a couple of other fixes in that file.) ldap/configure.ac: Extract out common configure stuff into modules/common/configure-{pre,post}.ac. common/Makefile.common: Common stuff is here.
author ben
date Mon, 18 Nov 2002 06:53:08 +0000
parents 804517e16990
children ecf1ebac70d8
comparison
equal deleted inserted replaced
1110:49065a0d2943 1111:184461bc8de4
337 Lisp_Object charset_by_attributes[4][128][2]; 337 Lisp_Object charset_by_attributes[4][128][2];
338 Ibyte next_allocated_1_byte_leading_byte; 338 Ibyte next_allocated_1_byte_leading_byte;
339 Ibyte next_allocated_2_byte_leading_byte; 339 Ibyte next_allocated_2_byte_leading_byte;
340 }; 340 };
341 341
342 extern struct charset_lookup *chlook;
343
342 DECLARE_INLINE_HEADER ( 344 DECLARE_INLINE_HEADER (
343 Lisp_Object 345 Lisp_Object
344 charset_by_leading_byte (int lb) 346 charset_by_leading_byte (int lb)
345 ) 347 )
346 { 348 {
347 extern struct charset_lookup *chlook;
348
349 #ifdef ERROR_CHECK_TEXT 349 #ifdef ERROR_CHECK_TEXT
350 /* When error-checking is on, x86 GCC 2.95.2 -O3 miscompiles the 350 /* When error-checking is on, x86 GCC 2.95.2 -O3 miscompiles the
351 following unless we introduce `tem'. */ 351 following unless we introduce `tem'. */
352 int tem = lb; 352 int tem = lb;
353 text_checking_assert (tem >= MIN_LEADING_BYTE && tem <= 0xFF); 353 text_checking_assert (tem >= MIN_LEADING_BYTE && tem <= 0xFF);
358 DECLARE_INLINE_HEADER ( 358 DECLARE_INLINE_HEADER (
359 Lisp_Object 359 Lisp_Object
360 charset_by_attributes (int type, int final, int dir) 360 charset_by_attributes (int type, int final, int dir)
361 ) 361 )
362 { 362 {
363 extern struct charset_lookup *chlook;
364
365 type_checking_assert (type < countof (chlook->charset_by_attributes) && 363 type_checking_assert (type < countof (chlook->charset_by_attributes) &&
366 final < countof (chlook->charset_by_attributes[0]) && 364 final < countof (chlook->charset_by_attributes[0]) &&
367 dir < countof (chlook->charset_by_attributes[0][0])); 365 dir < countof (chlook->charset_by_attributes[0][0]));
368 return chlook->charset_by_attributes[type][final][dir]; 366 return chlook->charset_by_attributes[type][final][dir];
369 } 367 }