aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero <[email protected]>2010-07-04 18:07:11 +0200
committerJuanma Barranquero <[email protected]>2010-07-04 18:07:11 +0200
commitb9503078536af127ced1d0e52ed09224cb575ab6 (patch)
tree2a4a906cc5fc88922d2488790fd50500e989a87f
parentdcc7404b4e06e555f110948bd509d34bf1889633 (diff)
* unexelf.c (round_up, find_section): Use ElfW macro for arguments.
-rw-r--r--src/ChangeLog1
-rw-r--r--src/unexelf.c8
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fecd07da95..d4a411b1d5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -10,6 +10,7 @@
* regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object.
(analyse_first): Fix "const const".
* sysdep.c (set_file_times): Use EMACS_TIME, not struct timeval.
+ * unexelf.c (round_up, find_section): Use ElfW macro for arguments.
* xgselect.c (xg_select): Use SELECT_TYPE, EMACS_TIME.
2010-07-04 Dan Nicolaescu <[email protected]>
diff --git a/src/unexelf.c b/src/unexelf.c
index f654d9dc8c..2ac6bbdc06 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -594,7 +594,7 @@ typedef unsigned char byte;
/* Round X up to a multiple of Y. */
static ElfW(Addr)
-round_up (Elf32_Addr x, Elf32_Addr y)
+round_up (ElfW(Addr) x, ElfW(Addr) y)
{
int rem = x % y;
if (rem == 0)
@@ -610,7 +610,8 @@ round_up (Elf32_Addr x, Elf32_Addr y)
if NOERROR is 0; we return -1 if NOERROR is nonzero. */
static int
-find_section (char *name, char *section_names, char *file_name, Elf32_Ehdr *old_file_h, Elf32_Shdr *old_section_h, int noerror)
+find_section (char *name, char *section_names, char *file_name,
+ ElfW(Ehdr) *old_file_h, ElfW(Shdr) *old_section_h, int noerror)
{
int idx;
@@ -645,7 +646,8 @@ find_section (char *name, char *section_names, char *file_name, Elf32_Ehdr *old_
*
*/
void
-unexec (char *new_name, char *old_name, unsigned int data_start, unsigned int bss_start, unsigned int entry_address)
+unexec (char *new_name, char *old_name, unsigned int data_start,
+ unsigned int bss_start, unsigned int entry_address)
{
int new_file, old_file, new_file_size;