From: Elliott Hughes <enh@google.com>
Date: Thu, 7 Nov 2013 00:10:14 +0000 (-0800)
Subject: am 3721a7e7: am 7115c802: Merge "Fix pread/pwrite for LP64."
X-Git-Tag: android-x86-6.0-r1~1272^2~644
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c606294b9397930a18d9c153186b77ece819588c;p=android-x86%2Fbionic.git

am 3721a7e7: am 7115c802: Merge "Fix pread/pwrite for LP64."

* commit '3721a7e71fc831f6d58b7253627043d0658ad977':
  Fix pread/pwrite for LP64.
---

c606294b9397930a18d9c153186b77ece819588c
diff --cc libc/Android.mk
index 5baf38113,190272e2d..c3ee617e5
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@@ -104,10 -104,8 +104,9 @@@ libc_common_src_files := 
  	bionic/md5.c \
  	bionic/memmem.c \
  	bionic/memswap.c \
 +	bionic/name_mem.c \
  	bionic/pathconf.c \
  	bionic/perror.c \
- 	bionic/pread.c \
  	bionic/ptsname.c \
  	bionic/ptsname_r.c \
  	bionic/pututline.c \