--- lib/gelftrans.c	Fri Aug 19 16:25:13 2005
+++ lib/gelftrans.c	Fri Aug 19 16:26:15 2005
@@ -53,7 +53,7 @@ 
 # undef ELF64_R_INFO
 # define ELF64_R_SYM(i)		((i)>>32)
 # define ELF64_R_TYPE(i)	((i)&0xffffffffL)
-# define ELF64_R_INFO(s,t)	(((Elf64_Xword)(s)<<32)+((t)&0xffffffffL))
+# define ELF64_R_INFO(s,t)	(((Elf64_Word)(s)<<32)+((t)&0xffffffffL))
 #endif /* !defined(...) */
 
 static char*
@@ -256,8 +256,8 @@ 
 	Elf32_Rela *src = (Elf32_Rela*)tmp;
 
 	check_and_copy(GElf_Addr,   dst, src, r_offset, NULL);
-	dst->r_info = ELF64_R_INFO((Elf64_Xword)ELF32_R_SYM(src->r_info),
-				   (Elf64_Xword)ELF32_R_TYPE(src->r_info));
+	dst->r_info = ELF64_R_INFO((Elf64_Word)ELF32_R_SYM(src->r_info),
+				   (Elf64_Word)ELF32_R_TYPE(src->r_info));
 	check_and_copy(GElf_Sxword, dst, src, r_addend, NULL);
     }
     else {
@@ -327,8 +327,8 @@ 
 	Elf32_Rel *src = (Elf32_Rel*)tmp;
 
 	check_and_copy(GElf_Addr, dst, src, r_offset, NULL);
-	dst->r_info = ELF64_R_INFO((Elf64_Xword)ELF32_R_SYM(src->r_info),
-				   (Elf64_Xword)ELF32_R_TYPE(src->r_info));
+	dst->r_info = ELF64_R_INFO((Elf64_Word)ELF32_R_SYM(src->r_info),
+				   (Elf64_Word)ELF32_R_TYPE(src->r_info));
     }
     else {
 	seterr(ERROR_UNIMPLEMENTED);