comparison src/extents.c @ 4932:8b63e21b0436

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 229bd619740a
children 19a72041c5ed
comparison
equal deleted inserted replaced
4931:8a08cf0b7583 4932:8b63e21b0436
3112 { 3112 {
3113 EXTENT e = extent_list_at (sel, i, 0); 3113 EXTENT e = extent_list_at (sel, i, 0);
3114 if (extent_start (e) == mempos && !NILP (extent_begin_glyph (e))) 3114 if (extent_start (e) == mempos && !NILP (extent_begin_glyph (e)))
3115 { 3115 {
3116 Lisp_Object glyph = extent_begin_glyph (e); 3116 Lisp_Object glyph = extent_begin_glyph (e);
3117 if (seen_glyph) { 3117 if (seen_glyph)
3118 struct glyph_block gb; 3118 {
3119 3119 struct glyph_block gb;
3120 gb.glyph = glyph; 3120
3121 gb.extent = wrap_extent (e); 3121 xzero (gb);
3122 Dynarr_add (ef->begin_glyphs, gb); 3122 gb.glyph = glyph;
3123 } 3123 gb.extent = wrap_extent (e);
3124 Dynarr_add (ef->begin_glyphs, gb);
3125 }
3124 else if (EQ (glyph, last_glyph)) 3126 else if (EQ (glyph, last_glyph))
3125 seen_glyph = 1; 3127 seen_glyph = 1;
3126 } 3128 }
3127 } 3129 }
3128 3130
3131 { 3133 {
3132 EXTENT e = extent_list_at (sel, i, 1); 3134 EXTENT e = extent_list_at (sel, i, 1);
3133 if (extent_end (e) == mempos && !NILP (extent_end_glyph (e))) 3135 if (extent_end (e) == mempos && !NILP (extent_end_glyph (e)))
3134 { 3136 {
3135 Lisp_Object glyph = extent_end_glyph (e); 3137 Lisp_Object glyph = extent_end_glyph (e);
3136 if (seen_glyph) { 3138 if (seen_glyph)
3137 struct glyph_block gb; 3139 {
3138 3140 struct glyph_block gb;
3139 gb.glyph = glyph; 3141
3140 gb.extent = wrap_extent (e); 3142 xzero (gb);
3141 Dynarr_add (ef->end_glyphs, gb); 3143 gb.glyph = glyph;
3142 } 3144 gb.extent = wrap_extent (e);
3145 Dynarr_add (ef->end_glyphs, gb);
3146 }
3143 else if (EQ (glyph, last_glyph)) 3147 else if (EQ (glyph, last_glyph))
3144 seen_glyph = 1; 3148 seen_glyph = 1;
3145 } 3149 }
3146 } 3150 }
3147 3151