generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts for merge of 43a3d66f to master

Browse Source 
Change-Id: I5e09ee0778f6971ae2c34de23f719328035c61ed
This commit is contained in:
David 'Digit' Turner 2010-06-09 18:26:16 -07:00
commit 5ccaf62090
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc/docs/CHANGES.TXT
View File

@ -13,6 +13,9 @@ Differences between current and Android 2.2:
- <semaphore.h>: Use private futexes for semaphore implementation, - <semaphore.h>: Use private futexes for semaphore implementation,
unless your set 'pshared' to non-0 when calling sem_init(). unless your set 'pshared' to non-0 when calling sem_init().
- sysconf() didn't work for some arguments due to a small bug in the
/proc line parser.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Differences between Android 2.2. and Android 2.1: Differences between Android 2.2. and Android 2.1:

2
libc/unistd/sysconf.c
View File

@ -317,7 +317,7 @@ line_parser_addc( LineParser* p, int c )
static int static int
line_parser_getc( LineParser* p ) line_parser_getc( LineParser* p )
{ {
if (p->in_len >= p->in_pos) { if (p->in_pos >= p->in_len) {
int ret; int ret;
p->in_len = p->in_pos = 0; p->in_len = p->in_pos = 0;