am 8e1ee7fd: merge from open-source master

This commit is contained in:
The Android Open Source Project 2010-05-17 15:03:01 -07:00 committed by Android Git Automerger
commit 204e82d0af
15 changed files with 56 additions and 57 deletions

View File

@ -50,7 +50,7 @@ int __sdidinit;
/* p r w flags file _bf z cookie close read seek write /* p r w flags file _bf z cookie close read seek write
ext */ ext */
/* the usual - (stdin + stdout + stderr) */ /* the usual - (stdin + stdout + stderr) */
static FILE usual[FOPEN_MAX - 3]; static FILE usual[FOPEN_MAX - 3];
static struct __sfileext usualext[FOPEN_MAX - 3]; static struct __sfileext usualext[FOPEN_MAX - 3];
static struct glue uglue = { 0, FOPEN_MAX - 3, usual }; static struct glue uglue = { 0, FOPEN_MAX - 3, usual };

View File

@ -42,7 +42,7 @@ putchar_unlocked(int c)
{ {
FILE *so = stdout; FILE *so = stdout;
return (putc_unlocked(c,so)); return (putc_unlocked(c, so));
} }
#undef putchar #undef putchar

View File

@ -39,7 +39,6 @@
static int static int
eofread(void *cookie, char *buf, int len) eofread(void *cookie, char *buf, int len)
{ {
return (0); return (0);
} }