# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1278259631 -7200
# Node ID 5f29e7d311d1206310d1c9217684ae3d21c7af8e
# Parent  efd2c7ec61fe987b81412112f3cc99b562d02578
* unexelf.c (round_up, find_section): Use ElfW macro for arguments.

diff -r efd2c7ec61fe -r 5f29e7d311d1 src/ChangeLog
--- a/src/ChangeLog	Sun Jul 04 16:40:41 2010 +0200
+++ b/src/ChangeLog	Sun Jul 04 18:07:11 2010 +0200
@@ -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  <dann@ics.uci.edu>
diff -r efd2c7ec61fe -r 5f29e7d311d1 src/unexelf.c
--- a/src/unexelf.c	Sun Jul 04 16:40:41 2010 +0200
+++ b/src/unexelf.c	Sun Jul 04 18:07:11 2010 +0200
@@ -594,7 +594,7 @@
 /* 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 @@
    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 @@
  *
  */
 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;