mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

* unexelf.c (unexec): Name an expression,

Browse source 
to avoid gcc -Wbad-function-cast warning.
This commit is contained in:
Paul Eggert 2011-03-16 18:52:35 -07:00
parent 43cfc33e3d
commit b3967b18cd
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2011-03-17 Paul Eggert <eggert@cs.ucla.edu>
* unexelf.c (unexec): Name an expression,
to avoid gcc -Wbad-function-cast warning.
* deps.mk (unexalpha.o): Remove; unused.
2011-03-16 Paul Eggert <eggert@cs.ucla.edu>

14
src/unexelf.c
View file

@ -625,6 +625,10 @@ unexec (const char *new_name, const char *old_name)
{
int new_file, old_file, new_file_size;
#if defined (emacs) || !defined (DEBUG)
void *new_break;
#endif
/* Pointers to the base of the image of the two files. */
caddr_t old_base, new_base;
@ -755,7 +759,8 @@ unexec (const char *new_name, const char *old_name)
old_name, old_file_h, old_section_h, 0);
#if defined (emacs) || !defined (DEBUG)
new_bss_addr = (ElfW(Addr)) sbrk (0);
new_break = sbrk (0);
new_bss_addr = (ElfW(Addr)) new_break;
#else
new_bss_addr = old_bss_addr + old_bss_size + 0x1234;
#endif
@ -956,13 +961,13 @@ temacs:
Link Info Adralgn Entsize
[22] 1 3 0x335150 0x315150 0x4 .data.rel.local
0 0 0x4 0
0 0 0x4 0
[23] 8 3 0x335158 0x315158 0x42720 .bss
0 0 0x8 0
0 0 0x8 0
[24] 2 0 0 0x315154 0x1c9d0 .symtab
25 1709 0x4 0x10
25 1709 0x4 0x10
*/
if (NEW_SECTION_H (nn).sh_offset >= old_bss_offset
@ -1309,4 +1314,3 @@ temacs:
if (chmod (new_name, stat_buf.st_mode) == -1)
fatal ("Can't chmod (%s): errno %d\n", new_name, errno);
}