comparison src/window.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 a98ca4640147
children 19a72041c5ed
comparison
equal deleted inserted replaced
4931:8a08cf0b7583 4932:8b63e21b0436
1046 else 1046 else
1047 return XINT (w->vertical_divider_line_width) == 0 ? 0 : 1; 1047 return XINT (w->vertical_divider_line_width) == 0 ? 0 : 1;
1048 } 1048 }
1049 1049
1050 int 1050 int
1051 window_scrollbar_width (struct window *w) 1051 window_scrollbar_width (struct window * USED_IF_SCROLLBARS (w))
1052 { 1052 {
1053 #ifdef HAVE_SCROLLBARS 1053 #ifdef HAVE_SCROLLBARS
1054 if (!WINDOW_WIN_P (w) 1054 if (!WINDOW_WIN_P (w)
1055 || MINI_WINDOW_P (w) 1055 || MINI_WINDOW_P (w)
1056 || NILP (w->buffer) 1056 || NILP (w->buffer)
1065 } 1065 }
1066 1066
1067 /* Horizontal scrollbars are only active on windows with truncation 1067 /* Horizontal scrollbars are only active on windows with truncation
1068 turned on. */ 1068 turned on. */
1069 int 1069 int
1070 window_scrollbar_height (struct window *w) 1070 window_scrollbar_height (struct window * USED_IF_SCROLLBARS (w))
1071 { 1071 {
1072 #ifdef HAVE_SCROLLBARS 1072 #ifdef HAVE_SCROLLBARS
1073 if (!WINDOW_WIN_P (w) 1073 if (!WINDOW_WIN_P (w)
1074 || MINI_WINDOW_P (w) 1074 || MINI_WINDOW_P (w)
1075 || NILP (w->buffer) 1075 || NILP (w->buffer)
1272 { 1272 {
1273 return window_bottom_window_gutter_height (w); 1273 return window_bottom_window_gutter_height (w);
1274 } 1274 }
1275 1275
1276 static int 1276 static int
1277 window_left_window_gutter_width (struct window *w, int modeline) 1277 window_left_window_gutter_width (struct window *w,
1278 int USED_IF_SCROLLBARS (modeline))
1278 { 1279 {
1279 if (!NILP (w->hchild) || !NILP (w->vchild)) 1280 if (!NILP (w->hchild) || !NILP (w->vchild))
1280 return 0; 1281 return 0;
1281 1282
1282 #ifdef HAVE_SCROLLBARS 1283 #ifdef HAVE_SCROLLBARS
1292 { 1293 {
1293 return window_left_window_gutter_width (w, modeline); 1294 return window_left_window_gutter_width (w, modeline);
1294 } 1295 }
1295 1296
1296 static int 1297 static int
1297 window_right_window_gutter_width (struct window *w, int modeline) 1298 window_right_window_gutter_width (struct window *w,
1299 int USED_IF_SCROLLBARS (modeline))
1298 { 1300 {
1299 int gutter = 0; 1301 int gutter = 0;
1300 1302
1301 if (!NILP (w->hchild) || !NILP (w->vchild)) 1303 if (!NILP (w->hchild) || !NILP (w->vchild))
1302 return 0; 1304 return 0;