Mercurial > hg > xemacs-beta
changeset 2553:b880fa9b5d8a
[xemacs-hg @ 2005-02-03 17:33:50 by james]
Fix the C++ build the rest of the way. See xemacs-patches message with
ID <ps4qgteel0.fsf@diannao.ittc.ku.edu>.
| author | james |
|---|---|
| date | Thu, 03 Feb 2005 17:34:03 +0000 |
| parents | 166ed8151e62 |
| children | 94f848eb8e4b |
| files | ChangeLog configure configure.in lisp/ChangeLog lisp/paragraphs.el src/ChangeLog src/dumper.c |
| diffstat | 7 files changed, 41 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Feb 03 16:30:38 2005 +0000 +++ b/ChangeLog Thu Feb 03 17:34:03 2005 +0000 @@ -1,3 +1,8 @@ +2005-02-03 Jerry James <james@xemacs.org> + + * configure.in: g++ 3.4.2 doesn't like -Wmissing-prototypes or + -Wstrict-prototypes. + 2005-01-31 Ben Wing <ben@xemacs.org> * GETTING.GNU.SOFTWARE: Delete.
--- a/configure Thu Feb 03 16:30:38 2005 +0000 +++ b/configure Thu Feb 03 17:34:03 2005 +0000 @@ -2980,10 +2980,9 @@ 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" cflags_warning="$cflags_warning -Wsign-compare -Wno-char-subscripts" - cflags_warning="$cflags_warning -Wundef -Wstrict-prototypes" test "$__GCC3" = "yes" && cflags_warning="$cflags_warning -Wpacked" test "$have_glibc" != "yes" && \ cflags_warning="$cflags_warning -Wpointer-arith" @@ -2993,6 +2992,7 @@ xe_cflags_warning="$cflags_warning -Wunused-parameter" fi cflags_warning="$cflags_warning -Wshadow -Wmissing-declarations" + cflags_warning="$cflags_warning -Wmissing-prototypes -Wstrict-prototypes" elif test "$__ICC" = "yes"; then cflags_warning="-Wall -w1 -we147" fi @@ -4853,12 +4853,12 @@ #line 4854 "configure" #include "confdefs.h" #include <stdio.h> -main() +int main() { FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); + if (!f) return(1); fprintf(f, "%d\n", sizeof(short)); - exit(0); + return(0); } EOF if { (eval echo configure:4865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 @@ -4895,12 +4895,12 @@ #line 4896 "configure" #include "confdefs.h" #include <stdio.h> -main() +int main() { FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); + if (!f) return(1); fprintf(f, "%d\n", sizeof(int)); - exit(0); + return(0); } EOF if { (eval echo configure:4907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 @@ -4931,12 +4931,12 @@ #line 4932 "configure" #include "confdefs.h" #include <stdio.h> -main() +int main() { FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); + if (!f) return(1); fprintf(f, "%d\n", sizeof(long)); - exit(0); + return(0); } EOF if { (eval echo configure:4943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 @@ -4967,12 +4967,12 @@ #line 4968 "configure" #include "confdefs.h" #include <stdio.h> -main() +int main() { FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); + if (!f) return(1); fprintf(f, "%d\n", sizeof(long long)); - exit(0); + return(0); } EOF if { (eval echo configure:4979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 @@ -5003,12 +5003,12 @@ #line 5004 "configure" #include "confdefs.h" #include <stdio.h> -main() +int main() { FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); + if (!f) return(1); fprintf(f, "%d\n", sizeof(void *)); - exit(0); + return(0); } EOF if { (eval echo configure:5015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 @@ -5039,12 +5039,12 @@ #line 5040 "configure" #include "confdefs.h" #include <stdio.h> -main() +int main() { FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); + if (!f) return(1); fprintf(f, "%d\n", sizeof(double)); - exit(0); + return(0); } EOF if { (eval echo configure:5051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
--- a/configure.in Thu Feb 03 16:30:38 2005 +0000 +++ b/configure.in Thu Feb 03 17:34:03 2005 +0000 @@ -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
--- a/lisp/ChangeLog Thu Feb 03 16:30:38 2005 +0000 +++ b/lisp/ChangeLog Thu Feb 03 17:34:03 2005 +0000 @@ -1,3 +1,8 @@ +2005-02-03 Jerry James <james@xemacs.org> + + * paragraphs.el: Require easy-mmode, due to its move in core. + * paragraphs.el (sentence-end): Fix a typo. + 2005-02-03 Ben Wing <ben@xemacs.org> * regexp-opt.el:
--- a/lisp/paragraphs.el Thu Feb 03 16:30:38 2005 +0000 +++ b/lisp/paragraphs.el Thu Feb 03 17:34:03 2005 +0000 @@ -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 \\|") "[.?!$B!#!%!)!*$A!##.#?#!$(0!$!%!)!*$(G!$!%!)!*(B][]\"')}]*" (if sentence-end-double-space
--- a/src/ChangeLog Thu Feb 03 16:30:38 2005 +0000 +++ b/src/ChangeLog Thu Feb 03 17:34:03 2005 +0000 @@ -1,3 +1,7 @@ +2005-02-03 Jerry James <james@xemacs.org> + + * dumper.c (pdump_load_finish): Cast to Rawbyte * instead of char *. + 2005-02-03 Jerry James <james@xemacs.org> * config.h.in: Remove #define this c_this.
--- a/src/dumper.c Thu Feb 03 16:30:38 2005 +0000 +++ b/src/dumper.c Thu Feb 03 17:34:03 2005 +0000 @@ -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++)