summaryrefslogtreecommitdiffstats
path: root/0.153
diff options
context:
space:
mode:
authorBen Cheng <bccheng@google.com>2013-12-09 17:03:37 -0800
committerBen Cheng <bccheng@google.com>2013-12-09 17:03:37 -0800
commite5eb669ca750d58d174c2110b8d915e0111e4b3b (patch)
tree32116e09768a9f838305914a62a247fb8d0485f2 /0.153
parent45865b2dbd3673ffb68a0f084949dce13a94d4ad (diff)
downloadandroid_external_elfutils-e5eb669ca750d58d174c2110b8d915e0111e4b3b.tar.gz
android_external_elfutils-e5eb669ca750d58d174c2110b8d915e0111e4b3b.tar.bz2
android_external_elfutils-e5eb669ca750d58d174c2110b8d915e0111e4b3b.zip
Fix off_t vs loff_t discrepancy for elfutils.
Change-Id: I12929f2ce3a1dcd8c9dfa9b908c1e1faf5ce3eb4
Diffstat (limited to '0.153')
-rw-r--r--0.153/bionic-fixup/AndroidFixup.h2
-rw-r--r--0.153/libelf/libelf.h6
2 files changed, 3 insertions, 5 deletions
diff --git a/0.153/bionic-fixup/AndroidFixup.h b/0.153/bionic-fixup/AndroidFixup.h
index be88af89..db324c47 100644
--- a/0.153/bionic-fixup/AndroidFixup.h
+++ b/0.153/bionic-fixup/AndroidFixup.h
@@ -19,8 +19,6 @@
#include <libgen.h> // for basename
-#define off_t loff_t
-
#ifndef MAX
#define MAX(x,y) ((x) > (y) ? (x) : (y))
#endif
diff --git a/0.153/libelf/libelf.h b/0.153/libelf/libelf.h
index b0b3a8d7..7cbff032 100644
--- a/0.153/libelf/libelf.h
+++ b/0.153/libelf/libelf.h
@@ -198,13 +198,13 @@ extern Elf_Cmd elf_next (Elf *__elf);
extern int elf_end (Elf *__elf);
/* Update ELF descriptor and write file to disk. */
-extern loff_t elf_update (Elf *__elf, Elf_Cmd __cmd);
+extern off_t elf_update (Elf *__elf, Elf_Cmd __cmd);
/* Determine what kind of file is associated with ELF. */
extern Elf_Kind elf_kind (Elf *__elf) __attribute__ ((__pure__));
/* Get the base offset for an object file. */
-extern loff_t elf_getbase (Elf *__elf);
+extern off_t elf_getbase (Elf *__elf);
/* Retrieve file identification data. */
@@ -334,7 +334,7 @@ extern char *elf_strptr (Elf *__elf, size_t __index, size_t __offset);
extern Elf_Arhdr *elf_getarhdr (Elf *__elf);
/* Return offset in archive for current file ELF. */
-extern loff_t elf_getaroff (Elf *__elf);
+extern off_t elf_getaroff (Elf *__elf);
/* Select archive element at OFFSET. */
extern size_t elf_rand (Elf *__elf, size_t __offset);