commit 6e9c1f61d8ea04d35d18709e373da355ca32e523
author Josh Gao <jmgao@google.com> Fri May 27 11:46:19 2016 -0700
committer Josh Gao <jmgao@google.com> Wed Jun 01 18:21:06 2016 -0700
tree 53246aadce25707fa94f0df83e07be4dc30810a8
parent 5a9d5691a44a128fc6a170380f0683b734dabada

Remove declaration for __brk.

Bug: http://b/28178111
Change-Id: I972789cd5da552000c32fd107b9df98330323d89

libc/bionic/brk.cpp

diff --git a/libc/bionic/brk.cpp b/libc/bionic/brk.cpp
index 4e46193..a8c078b 100644
--- a/libc/bionic/brk.cpp
+++ b/libc/bionic/brk.cpp
@@ -35,6 +35,8 @@
 void* __bionic_brk; // Accidentally exported by the NDK.
 #endif
 
+extern "C" void* __brk(void* __addr);
+
 int brk(void* end_data) {
   __bionic_brk = __brk(end_data);
   if (__bionic_brk < end_data) {

libc/include/unistd.h

diff --git a/libc/include/unistd.h b/libc/include/unistd.h
index 6b5ef76..71764ae 100644
--- a/libc/include/unistd.h
+++ b/libc/include/unistd.h
@@ -204,7 +204,6 @@
 int gethostname(char* __name, size_t __len);
 int sethostname(const char* __name, size_t __len) __INTRODUCED_IN(23);
 
-extern void* __brk(void* __addr);
 extern int brk(void* __addr);
 extern void* sbrk(ptrdiff_t __increment);