APPROVE COMMIT 21.5 My last two patches worked well in isolation, but left a few problems when combined. This patch cleans up a few remaining issues with the C++ build. I know that we should work on configure.ac in preference to configure.in, but I would like to have this problem fixed while we still have configure.in. I'll see that it gets transmitted to configure.ac. ChangeLog addition: 2005-02-03 Jerry James <james(a)xemacs.org&gt; * configure.in: g++ 3.4.2 doesn't like -Wmissing-prototypes or -Wstrict-prototypes. lisp/ChangeLog addition: 2005-02-03 Jerry James <james(a)xemacs.org&gt; * paragraphs.el: Require easy-mmode, due to its move in core. * paragraphs.el (sentence-end): Fix a typo. src/ChangeLog addition: 2005-02-03 Jerry James <james(a)xemacs.org&gt; * dumper.c (pdump_load_finish): Cast to Rawbyte * instead of char *. xemacs-21.5 source patch: Diff command: cvs -q diff -uN Files affected: src/dumper.c lisp/paragraphs.el configure.in Index: configure.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v retrieving revision 1.237 diff -d -u -r1.237 configure.in --- configure.in 2005/01/26 10:02:12 1.237 +++ configure.in 2005/02/03 17:14:09 ＠＠ -2103,7 +2103,7 ＠＠ elif test "$CC" = "xlc"; then cflags_warning="-qinfo" elif test "$GCC" = "yes"; then - cflags_warning="-Wall -Wno-switch -Wmissing-prototypes" + cflags_warning="-Wall -Wno-switch -Wundef" dnl This is not very useful, as it issues warnings that may appear dnl or disappear rather randomly, cannot easily be fixed, and are dnl not a big deal. If you want it, add it yourself. ＠＠ -2113,7 +2113,6 ＠＠ dnl Warnings about char subscripts are pretty pointless, though, dnl and we use them in various places. cflags_warning="$cflags_warning -Wsign-compare -Wno-char-subscripts" - cflags_warning="$cflags_warning -Wundef -Wstrict-prototypes" test "$__GCC3" = "yes" && cflags_warning="$cflags_warning -Wpacked" dnl glibc is intentionally not `-Wpointer-arith'-clean. dnl Ulrich Drepper has rejected patches to fix the glibc header files. ＠＠ -2134,6 +2133,7 ＠＠ xe_cflags_warning="$cflags_warning -Wunused-parameter" fi cflags_warning="$cflags_warning -Wshadow -Wmissing-declarations" + cflags_warning="$cflags_warning -Wmissing-prototypes -Wstrict-prototypes" dnl **** If more gcc/g++ flags are added, from here on must handle dnl **** cflags_warning and xe_cflags_warning in parallel elif test "$__ICC" = "yes"; then Index: lisp/paragraphs.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/paragraphs.el,v retrieving revision 1.8 diff -d -u -r1.8 paragraphs.el --- lisp/paragraphs.el 2005/02/03 07:15:56 1.8 +++ lisp/paragraphs.el 2005/02/03 17:14:09 ＠＠ -37,6 +37,8 ＠＠ ;;; Code: +(require 'easy-mmode) + (defgroup paragraphs nil "Paragraph and sentence parsing." :group 'editing) ＠＠ -147,7 +149,7 ＠＠ (defcustom sentence-end (purecopy ;; This is a bit stupid since it's not auto-updated when the - ;; other variables are changes, but it's still useful info. + ;; other variables are changed, but it's still useful info. (concat (if sentence-end-without-period "\\w \\|") "[.?!。．？！ 。．？！ 。．？！ $(G!$!%!)!*(B][]\"')}]*" (if sentence-end-double-space Index: src/dumper.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dumper.c,v retrieving revision 1.23 diff -d -u -r1.23 dumper.c --- src/dumper.c 2005/02/03 16:14:05 1.23 +++ src/dumper.c 2005/02/03 17:14:10 ＠＠ -1819,12 +1819,12 ＠＠ p = pdump_start + header->stab_offset; /* Get the cv_data array */ - p = (char *) ALIGN_PTR (p, pdump_cv_data_dump_info); + p = (Rawbyte *) ALIGN_PTR (p, pdump_cv_data_dump_info); pdump_loaded_cv_data = (pdump_cv_data_dump_info *)p; p += header->nb_cv_data*sizeof(pdump_cv_data_dump_info); /* Build the cv_ptr array */ - p = (char *) ALIGN_PTR (p, pdump_cv_ptr_dump_info); + p = (Rawbyte *) ALIGN_PTR (p, pdump_cv_ptr_dump_info); pdump_loaded_cv_ptr = alloca_array (pdump_cv_ptr_load_info, header->nb_cv_ptr); for (i = 0; i < header->nb_cv_ptr; i++) -- Jerry James http://www.ittc.ku.edu/~james/