commit 6cbc56b84be72b3f01c23b865e39f61a01ead895
author Elliott Hughes <enh@google.com> Thu Dec 04 00:45:42 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 04 00:45:42 2014 +0000
tree 3d53d7b94252cb4f5e98f92918c00a0c21c08dcb
parent 1898967e41c12948e363b9a442f65965a884cf2d
parent 65f0df78730fb0d6994f9d4d0a16dc0241081d94

Merge "Implement <pty.h>."

build/run-on-host.mk

diff --git a/build/run-on-host.mk b/build/run-on-host.mk
index f016361..dc7e5d5 100644
--- a/build/run-on-host.mk
+++ b/build/run-on-host.mk
@@ -14,6 +14,10 @@
 # limitations under the License.
 #
 
+# Include once
+ifneq ($(bionic_run_on_host_mk_included),true)
+bionic_run_on_host_mk_included:=true
+
 ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm mips x86))
 LINKER = linker64
 else
@@ -37,3 +41,4 @@
 	  ln -fs `realpath $(TARGET_OUT)/lib64` /system/; \
 	fi
 endif
+endif

libc/SYSCALLS.TXT

diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT
index 39ff37d..d9ede2f 100644
--- a/libc/SYSCALLS.TXT
+++ b/libc/SYSCALLS.TXT
@@ -101,7 +101,7 @@
 void*       mremap(void*, size_t, size_t, unsigned long)  all
 int         msync(const void*, size_t, int)    all
 int         mprotect(const void*, size_t, int)  all
-int         madvise(const void*, size_t, int)  all
+int         madvise(void*, size_t, int)  all
 int         mlock(const void* addr, size_t len)    all
 int         munlock(const void* addr, size_t len)   all
 int         mlockall(int flags)   all

libc/include/sys/mman.h

diff --git a/libc/include/sys/mman.h b/libc/include/sys/mman.h
index 5a8c985..09bf0d9 100644
--- a/libc/include/sys/mman.h
+++ b/libc/include/sys/mman.h
@@ -54,7 +54,7 @@
 extern int munlockall(void);
 extern int mlock(const void*, size_t);
 extern int munlock(const void*, size_t);
-extern int madvise(const void*, size_t, int);
+extern int madvise(void*, size_t, int);
 
 extern int mlock(const void*, size_t);
 extern int munlock(const void*, size_t);