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

am aaad5485: Merge "Re-expose more stdio implementation details for LP32." into lmp-dev

Browse Source 
* commit 'aaad548535c34e2bba16b2a0b71173e0ae4b16c0':
  Re-expose more stdio implementation details for LP32.
This commit is contained in:
Elliott Hughes 2014-09-25 03:13:56 +00:00 committed by Android Git Automerger
commit e74a9d0b35
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libc/stdio/glue.h
View File

@ -42,8 +42,5 @@ struct glue {
FILE *iobs; FILE *iobs;
}; };
#pragma GCC visibility push(hidden) /* This was referenced by a couple of different pieces of middleware and the Crystax NDK. */
__LIBC64_HIDDEN__ extern struct glue __sglue;
extern struct glue __sglue;
#pragma GCC visibility pop

14
libc/stdio/local.h
View File

@ -53,21 +53,24 @@ __LIBC64_HIDDEN__ int __srefill(FILE*);
/* This was referenced by the apportable middleware for LP32. */ /* This was referenced by the apportable middleware for LP32. */
__LIBC64_HIDDEN__ int __swsetup(FILE*); __LIBC64_HIDDEN__ int __swsetup(FILE*);
/* These were referenced by a couple of different pieces of middleware and the Crystax NDK. */
__LIBC64_HIDDEN__ extern int __sdidinit;
__LIBC64_HIDDEN__ int __sflags(const char*, int*);
__LIBC64_HIDDEN__ FILE* __sfp(void);
__LIBC64_HIDDEN__ void __sinit(void);
__LIBC64_HIDDEN__ void __smakebuf(FILE*);
#pragma GCC visibility push(hidden) #pragma GCC visibility push(hidden)
int __sflush(FILE *); int __sflush(FILE *);
int __sflush_locked(FILE *); int __sflush_locked(FILE *);
FILE *__sfp(void);
int __sread(void *, char *, int); int __sread(void *, char *, int);
int __swrite(void *, const char *, int); int __swrite(void *, const char *, int);
fpos_t __sseek(void *, fpos_t, int); fpos_t __sseek(void *, fpos_t, int);
int __sclose(void *); int __sclose(void *);
void __sinit(void);
void _cleanup(void); void _cleanup(void);
void __smakebuf(FILE *);
int __swhatbuf(FILE *, size_t *, int *); int __swhatbuf(FILE *, size_t *, int *);
int _fwalk(int (*)(FILE *)); int _fwalk(int (*)(FILE *));
int __sflags(const char *, int *);
wint_t __fgetwc_unlock(FILE *); wint_t __fgetwc_unlock(FILE *);
wint_t __ungetwc(wint_t, FILE *); wint_t __ungetwc(wint_t, FILE *);
int __vfprintf(FILE *, const char *, __va_list); int __vfprintf(FILE *, const char *, __va_list);
@ -76,7 +79,6 @@ int __vfwprintf(FILE * __restrict, const wchar_t * __restrict, __va_list);
int __vfwscanf(FILE * __restrict, const wchar_t * __restrict, __va_list); int __vfwscanf(FILE * __restrict, const wchar_t * __restrict, __va_list);
extern void __atexit_register_cleanup(void (*)(void)); extern void __atexit_register_cleanup(void (*)(void));
extern int __sdidinit;
/* /*
* Return true if the given FILE cannot be written now. * Return true if the given FILE cannot be written now.
@ -114,8 +116,6 @@ extern int __sdidinit;
#define NO_PRINTF_PERCENT_N #define NO_PRINTF_PERCENT_N
/* OpenBSD exposes these in <stdio.h>, but we only want them exposed to the implementation. */ /* OpenBSD exposes these in <stdio.h>, but we only want them exposed to the implementation. */
int __srget(FILE*);
int __swbuf(int, FILE*);
#define __sfeof(p) (((p)->_flags & __SEOF) != 0) #define __sfeof(p) (((p)->_flags & __SEOF) != 0)
#define __sferror(p) (((p)->_flags & __SERR) != 0) #define __sferror(p) (((p)->_flags & __SERR) != 0)
#define __sclearerr(p) ((void)((p)->_flags &= ~(__SERR|__SEOF))) #define __sclearerr(p) ((void)((p)->_flags &= ~(__SERR|__SEOF)))