tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove declaration for __brk."

Browse source 
am: e20730ca0b

* commit 'e20730ca0be39c52f22d6155043cbb69abd7eb36':
  Remove declaration for __brk.

Change-Id: I503fd3d0164489b839aacc2ed55e953c15ef026a
This commit is contained in:
Josh Gao 2016-06-02 02:32:38 +00:00 committed by android-build-merger
commit 73d521e9db
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/bionic/brk.cpp
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) {

1
libc/include/unistd.h
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);