Mercurial > hg > xemacs-beta

comparison src/objects-xlike-inc.c @ 4932:8b63e21b0436

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix compile issues with gcc 4 -------------------- ChangeLog entries follow: -------------------- ChangeLog addition: 2010-01-24 Ben Wing <ben@xemacs.org> * aclocal.m4 (XE_SHLIB_STUFF): Use -export-all-symbols instead of -export-dynamic on PE targets (Cygwin and MinGW). * configure.ac (XE_EXPAND_VARIABLE): * configure.ac (TAB): Create variable XEMACS_CC_GPP to check whether we're running g++. Don't just check for an executable called `g++' -- it might be called g++-4 or whatever. Instead, check for either named `g++*' or claiming to be g++ when called with --version. Rewrite code do use the variable. Add -fno-strict-aliasing to optimization flags when GCC and optimized, and in all cases with g++, since under these circumstances strict aliasing is otherwise assumed, and XEmacs can't easily be made to respect its restrictions. * configure: Regenerate. lib-src/ChangeLog addition: 2010-01-24 Ben Wing <ben@xemacs.org> * fakemail.c (args_size): * fakemail.c (parse_header): * ootags.c (C_entries): Fix warnings about possible use of uninitialized vars. lwlib/ChangeLog addition: 2010-01-24 Ben Wing <ben@xemacs.org> * xlwgauge.c (GaugeResize): * xlwgauge.c (GaugeSize): Fix warnings about possible use of uninitialized vars. modules/ChangeLog addition: 2010-01-24 Ben Wing <ben@xemacs.org> * postgresql/postgresql.c (CHECK_LIVE_CONNECTION): * postgresql/postgresql.c (print_pgconn): * postgresql/postgresql.c (Fpq_connectdb): * postgresql/postgresql.c (Fpq_connect_start): * postgresql/postgresql.c (Fpq_exec): * postgresql/postgresql.c (Fpq_get_result): Fix g++ 4.3 complaints about implicit conversions of string literals (const char *) to char *. src/ChangeLog addition: 2010-01-24 Ben Wing <ben@xemacs.org> * chartab.c (decode_char_table_range): * extents.c (extent_fragment_update): * objects-msw.c (initialize_font_instance): * process.c (Fgetenv): * redisplay-output.c (get_next_display_block): Fix warnings about possible use of uninitialized vars. * compiler.h: * compiler.h (REGISTER): * event-stream.c (is_scrollbar_event): * window.c (window_scrollbar_width): * window.c (window_scrollbar_height): * window.c (window_left_window_gutter_width): * window.c (window_right_window_gutter_width): Add USED_IF_SCROLLBARS. Use it to fix warnings about unused vars when --with-scrollbars=no. * config.h.in: Change comment to explain better why DECLARE_INLINE_HEADER is needed. * dialog-msw.c: * emacs.c (SHEBANG_EXE_PROGNAME_LENGTH): * emacs.c (main_1): * event-msw.c (struct mswin_message_debug): * event-msw.c (debug_output_mswin_message): * font-mgr.c: * font-mgr.c (Ffc_config_filename): * glyphs-msw.c (struct): * glyphs-msw.c (bitmap_table): * glyphs-x.c (update_widget_face): * intl-win32.c (struct lang_to_string): * intl-win32.c (lang_to_string_table): * nas.c: * objects-xlike-inc.c: * objects-xlike-inc.c (xft_find_charset_font): * syswindows.h: * win32.c (mswindows_output_last_error): Fix g++ 4.3 complaints about implicit conversions of string literals (const char *) to char *. * lisp.h: G++ 4.3 needs #include <limits> to avoid errors about min/max. * lisp.h (disabled_assert_with_message): Use disabled_assert* whenever asserts are disabled. Rewrite disabled_assert* to avoid complaints about unused vars by pretending to use the vars but casting them to (void). Remove code that defined assert() weirdly if DEBUG_XEMACS but not USE_ASSERTIONS -- configure sets USE_ASSERTIONS automatically when DEBUG_XEMACS, and if the user has forced it off, then so be it. * lisp.h (SYMBOL_KEYWORD): Put some of the combined `extern Lisp_Object's back under the file they are declared in. Cosmetic fix. * number.h: Remove `extern Lisp_Object' decls that duplicate lisp.h, since they have different C vs. C++ linkage.
author Ben Wing <ben@xemacs.org>
date Sun, 24 Jan 2010 22:04:58 -0600
parents 0d3ccd5a2509
children 19a72041c5ed
comparison
equal deleted inserted replaced
4931:8a08cf0b7583 4932:8b63e21b0436
325 } 325 }
326 326
327 struct charset_reporter { 327 struct charset_reporter {
328 Lisp_Object *charset; 328 Lisp_Object *charset;
329 /* This is a debug facility, require ASCII. */ 329 /* This is a debug facility, require ASCII. */
330 Extbyte *language; /* ASCII, please */ 330 const Ascbyte *language; /* ASCII, please */
331 /* Technically this is FcChar8, but fsckin' GCC 4 bitches. 331 /* Technically this is FcChar8, but fsckin' GCC 4 bitches.
332 RFC 3066 is a combination of ISO 639 and ISO 3166. */ 332 RFC 3066 is a combination of ISO 639 and ISO 3166. */
333 Extbyte *rfc3066; /* ASCII, please */ 333 const Ascbyte *rfc3066; /* ASCII, please */
334 }; 334 };
335 335
336 static struct charset_reporter charset_table[] = 336 static struct charset_reporter charset_table[] =
337 { 337 {
338 /* #### It's my branch, my favorite charsets get checked first! 338 /* #### It's my branch, my favorite charsets get checked first!
422 else 422 else
423 { 423 {
424 FcPattern *fontxft; /* long-lived, freed at end of this block */ 424 FcPattern *fontxft; /* long-lived, freed at end of this block */
425 FcResult fcresult; 425 FcResult fcresult;
426 FcConfig *fcc; 426 FcConfig *fcc;
427 FcChar8 *lang = (FcChar8 *) "en"; /* #### fix this bogus hack! */ 427 const Ascbyte *lang = "en";
428 FcCharSet *fccs = NULL; 428 FcCharSet *fccs = NULL;
429 DECLARE_EISTRING (eistr_shortname); /* user-friendly nickname */ 429 DECLARE_EISTRING (eistr_shortname); /* user-friendly nickname */
430 DECLARE_EISTRING (eistr_longname); /* omit FC_LANG and FC_CHARSET */ 430 DECLARE_EISTRING (eistr_longname); /* omit FC_LANG and FC_CHARSET */
431 DECLARE_EISTRING (eistr_fullname); /* everything */ 431 DECLARE_EISTRING (eistr_fullname); /* everything */
432 432
539 539
540 if (cr->rfc3066) 540 if (cr->rfc3066)
541 { 541 {
542 DECLARE_DEBUG_FONTNAME (name); 542 DECLARE_DEBUG_FONTNAME (name);
543 CHECKING_LANG (0, eidata(name), cr->language); 543 CHECKING_LANG (0, eidata(name), cr->language);
544 lang = (FcChar8 *) cr->rfc3066; 544 lang = cr->rfc3066;
545 } 545 }
546 else if (cr->charset) 546 else if (cr->charset)
547 { 547 {
548 /* what the hey, build 'em on the fly */ 548 /* what the hey, build 'em on the fly */
549 /* #### in the case of error this could return NULL! */ 549 /* #### in the case of error this could return NULL! */
550 fccs = mule_to_fc_charset (charset); 550 fccs = mule_to_fc_charset (charset);
551 lang = (FcChar8 *) XSTRING_DATA (XSYMBOL 551 /* #### Bad idea here */
552 (XCHARSET_NAME (charset))-> name); 552 lang = (const Ascbyte *) XSTRING_DATA (XSYMBOL (XCHARSET_NAME
553 (charset))->name);
553 } 554 }
554 else 555 else
555 { 556 {
556 /* OK, we fell off the end of the table */ 557 /* OK, we fell off the end of the table */
557 warn_when_safe_lispobj (intern ("xft"), intern ("alert"), 558 warn_when_safe_lispobj (intern ("xft"), intern ("alert"),
560 /* default to "en" 561 /* default to "en"
561 #### THIS IS WRONG, WRONG, WRONG!! 562 #### THIS IS WRONG, WRONG, WRONG!!
562 It is why we never fall through to XLFD-checking. */ 563 It is why we never fall through to XLFD-checking. */
563 } 564 }
564 565
565 ASSERT_ASCTEXT_ASCII((Extbyte *) lang); 566 ASSERT_ASCTEXT_ASCII (lang);
566 567
567 if (fccs) 568 if (fccs)
568 { 569 {
569 /* check for character set coverage */ 570 /* check for character set coverage */
570 int i = 0; 571 int i = 0;
619 /* Urk! Fall back and punt to core font. */ 620 /* Urk! Fall back and punt to core font. */
620 DEBUG_XFT1 (0, "Unexpected type of lang value (%s)\n", 621 DEBUG_XFT1 (0, "Unexpected type of lang value (%s)\n",
621 FcTypeOfValueToString (v)); 622 FcTypeOfValueToString (v));
622 result = Qnil; 623 result = Qnil;
623 } 624 }
624 else if (FcLangSetHasLang (v.u.l, lang) != FcLangDifferentLang) 625 else if (FcLangSetHasLang (v.u.l, (FcChar8 *) lang)
626 != FcLangDifferentLang)
625 { 627 {
626 DECLARE_DEBUG_FONTNAME (name); 628 DECLARE_DEBUG_FONTNAME (name);
627 DEBUG_XFT2 (0, "Xft font %s supports %s\n", 629 DEBUG_XFT2 (0, "Xft font %s supports %s\n",
628 eidata(name), lang); 630 eidata(name), lang);
629 #ifdef RETURN_LONG_FONTCONFIG_NAMES 631 #ifdef RETURN_LONG_FONTCONFIG_NAMES