Merge "Remove declaration for __brk."

This commit is contained in:
Treehugger Robot 2016-06-02 02:25:58 +00:00 committed by Gerrit Code Review
commit e20730ca0b
2 changed files with 2 additions and 1 deletions

View file

@ -35,6 +35,8 @@ static void* __bionic_brk;
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) {

View file

@ -204,7 +204,6 @@ extern int usleep(useconds_t __usec);
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);