Mercurial > hg > xemacs-beta
changeset 5500:01900734203a
Auto merge.
| author | Jeff Sparkes <jsparkes@gmail.com> |
|---|---|
| date | Tue, 03 May 2011 08:13:21 -0400 |
| parents | 4b5b7dcc19d6 (current diff) eb4eeec50f25 (diff) |
| children | 4813ff11c6e2 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon May 02 08:51:19 2011 -0400 +++ b/src/ChangeLog Tue May 03 08:13:21 2011 -0400 @@ -1,3 +1,8 @@ +2011-05-03 Stephen J. Turnbull <stephen@xemacs.org> + + * dumper.c (pdump_file_try): Remove static qualifier. + Thanks to Hans de Graaff of Gentoo and Marcus Crestani. + 2011-05-01 Aidan Kehoe <kehoea@parhasard.net> * lread.c (parse_integer):
--- a/src/dumper.c Mon May 02 08:51:19 2011 -0400 +++ b/src/dumper.c Tue May 03 08:13:21 2011 -0400 @@ -2593,8 +2593,9 @@ #endif /* !WIN32_NATIVE */ - -static int +/* This used to be static, but there seems to be a bug in the GCC 4.1.2 + optimizer that clobbers exe_path. */ +int pdump_file_try (Wexttext *exe_path) { Wexttext *w = exe_path + wext_strlen (exe_path);